Jika/element-web
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Commit Graph

  • eb7144ef85 improve layout Matthew Hodgson 2016-01-18 19:56:56 +00:00
  • 0a79b0f9e2 fix NPE from kegan's memberlist branch Matthew Hodgson 2016-01-18 19:56:47 +00:00
  • 7b91d3c5f8 wording changes from Amandine to settings Matthew Hodgson 2016-01-18 19:56:38 +00:00
  • 765174a600 merge conflict Matthew Hodgson 2016-01-18 19:56:35 +00:00
  • d5c291ae62 Merge branch 'kegan/invite-search' into matthew/roompreview Matthew Hodgson 2016-01-18 18:00:58 +00:00
  • e68972fb1a Remove generateClientSecret and use the one the js sdk gives us. David Baker 2016-01-18 17:50:27 +00:00
  • 491ba94230 WIP: try to support non-guest room peek. Rename visibility permissions in room settings a bit, and fix how they are persisted. Matthew Hodgson 2016-01-18 17:39:23 +00:00
  • a8643ff039 Move power level stuff to EntityTile for now Kegan Dougal 2016-01-18 17:37:17 +00:00
  • d6f6f32c74 WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now Matthew Hodgson 2016-01-18 17:37:13 +00:00
  • 317e1fb9cd Merge branch 'develop' into kegan/invite-search Kegan Dougal 2016-01-18 17:33:26 +00:00
  • 0465323ca6 Merge branch 'develop' into kegan/invite-search Kegan Dougal 2016-01-18 17:31:26 +00:00
  • 37e8a35967 Merge pull request #641 from vector-im/push-rules-settings manuroe 2016-01-18 18:25:31 +01:00
  • 6182c983ab PushRules settings: Applied review remarks (2/2) manuroe 2016-01-18 18:24:53 +01:00
  • ac4b221690 More CSS fun for border bottom Kegan Dougal 2016-01-18 17:22:02 +00:00
  • f1042bd1c4 UI tweaks Kegan Dougal 2016-01-18 17:21:28 +00:00
  • fdf5b0a4fc Merge branch 'develop' into push-rules-settings manuroe 2016-01-18 18:14:20 +01:00
  • 36616a97a1 Add ability to click-to-invite Kegan Dougal 2016-01-18 17:12:35 +00:00
  • 7c0fffa79b PushRules settings: Applied easy review remarks manuroe 2016-01-18 18:07:33 +01:00
  • 772470a0ee Merge pull request #97 from matrix-org/push-rules-settings manuroe 2016-01-18 18:02:34 +01:00
  • 33edeccb43 Merge branch 'develop' into push-rules-settings manuroe 2016-01-18 18:00:41 +01:00
  • 165adde0c8 Use EntityTile for 3PID entities rather than munging MemberTile Kegan Dougal 2016-01-18 16:55:51 +00:00
  • c758c0f84f Add invite button JSX Kegan Dougal 2016-01-18 16:47:31 +00:00
  • fef02f2fd1 s/MemberTile/EntityTile/ Kegan Dougal 2016-01-18 16:43:00 +00:00
  • bdcf683942 PushRules settings: Create a dedicated rule for "Messages sent to group". The default fallback rule cannot be used because it matches with too much events. manuroe 2016-01-18 16:41:48 +01:00
  • ae14210763 PushRules settings: Put keywords in the right position manuroe 2016-01-18 16:31:18 +01:00
  • 830160f074 PushRules settings: Enabled all radio buttons of the table. Each rule is described in the code so that if the server does not have it in its default rules or if the user wants to use actions different from the hs one, the code will create a new rule that will override the hs one. manuroe 2016-01-18 16:20:33 +01:00
  • 71009d81b6 Factor out common code between MemberTile and UserTile into EntityTile. Use EntityTile. Kegan Dougal 2016-01-18 15:19:49 +00:00
  • cc3d27bd4b Merge pull request #98 from matrix-org/message_composer_arrows_keys David Baker 2016-01-18 14:25:57 +00:00
  • 880ae0f3fa Fix typo David Baker 2016-01-18 14:25:23 +00:00
  • 0ac997491e Clarify comment David Baker 2016-01-18 14:23:31 +00:00
  • 795d782410 Merge pull request #100 from matrix-org/matthew/roomsettings2 Matthew Hodgson 2016-01-18 14:02:27 +00:00
  • 51648b9bf0 merge develop Matthew Hodgson 2016-01-18 14:02:19 +00:00
  • 17fdfa0c8f incorporate kegan PR feedback Matthew Hodgson 2016-01-18 14:00:47 +00:00
  • 0ef03c5ca4 Merge pull request #653 from vector-im/matthew/roomsettings2 Matthew Hodgson 2016-01-18 13:39:55 +00:00
  • 5a1b0a1dab Merge pull request #657 from vector-im/matthew/memberlist Matthew Hodgson 2016-01-18 13:39:42 +00:00
  • 9fae4d4ecd Merge pull request #101 from matrix-org/matthew/memberlist Matthew Hodgson 2016-01-18 13:39:29 +00:00
  • aa412bed0f reindent promises as per dave's PR feedback Matthew Hodgson 2016-01-18 13:38:40 +00:00
  • d0eedb4faa merge develop Matthew Hodgson 2016-01-18 13:34:09 +00:00
  • fd99b260f4 Merge branch 'develop' into kegan/invite-search Kegan Dougal 2016-01-18 12:07:36 +00:00
  • 77621fe035 Add missing CSS from #638 Kegan Dougal 2016-01-18 12:06:46 +00:00
  • 2a64d0feb3 Merge branch 'develop' into matthew/roomsettings2 Kegan Dougal 2016-01-18 10:49:45 +00:00
  • 6e42d00727 Merge pull request #95 from matrix-org/kegan/base-avatar Kegsay 2016-01-18 10:18:04 +00:00
  • 7e40d81a44 Merge pull request #638 from vector-im/kegan/base-avatar Kegsay 2016-01-18 10:17:57 +00:00
  • 8f83621c4c hide Mod button for muted users Matthew Hodgson 2016-01-18 01:40:19 +00:00
  • 6e3245a3b0 make linkify userid jump to memberinfo Matthew Hodgson 2016-01-18 01:26:15 +00:00
  • 8792be4db2 moar space Matthew Hodgson 2016-01-18 01:25:57 +00:00
  • 1fef91b82c MemberInfo lipstick Matthew Hodgson 2016-01-18 01:18:11 +00:00
  • 8e1ab8e6b4 vaguely skin MemberInfo correctly Matthew Hodgson 2016-01-18 01:18:02 +00:00
  • 430c90f4a4 oops ,forgot PowerSelector Matthew Hodgson 2016-01-17 23:58:38 +00:00
  • a768b7fe4b bring back power badges Matthew Hodgson 2016-01-18 00:16:31 +00:00
  • b2a1c89e83 bring back power badges Matthew Hodgson 2016-01-18 00:16:04 +00:00
  • 0553551d92 oops ,forgot PowerSelector Matthew Hodgson 2016-01-17 23:58:38 +00:00
  • f3aeda7af9 merge develop Matthew Hodgson 2016-01-17 23:31:21 +00:00
  • 1467aacfa4 support saving tag changes (untested) Matthew Hodgson 2016-01-17 12:27:21 +00:00
  • 40d2018c17 fix checkbox css Matthew Hodgson 2016-01-17 12:26:54 +00:00
  • 06e1674f23 UI for tag management Matthew Hodgson 2016-01-17 05:13:16 +00:00
  • 5b5bd9aef1 remove create_room for now. lots of stupid bugfixes across the board. Matthew Hodgson 2016-01-17 03:59:31 +00:00
  • 82a159d651 make roomsettings actually work, including alias editing. (using staged UX rather than direct manipulation). loads of tweaks and fixes across the board Matthew Hodgson 2016-01-17 02:48:55 +00:00
  • a61afa0f31 fix css thinko Matthew Hodgson 2016-01-17 02:46:22 +00:00
  • 4e7c58e242 fix broken icon Matthew Hodgson 2016-01-17 02:46:15 +00:00
  • 8771369937 more layout Matthew Hodgson 2016-01-15 20:29:44 +00:00
  • 7045906d5d Show user settings screen on registration instead of the PostRegister stuff. David Baker 2016-01-15 18:58:18 +00:00
  • a90f63f72c null check David Baker 2016-01-15 18:49:12 +00:00
  • 52de322789 Change history scolling so it doesn't interfere with moving between lines, even when those lines are wrapped rather than hard line breaks. David Baker 2016-01-15 18:31:07 +00:00
  • d6c7631dcc Show User avatar URLs Kegan Dougal 2016-01-15 17:31:32 +00:00
  • 4d47d9875b Merge branch 'kegan/base-avatar' into kegan/invite-search Kegan Dougal 2016-01-15 17:19:34 +00:00
  • 855bef17fa Fold BaseAvatar state mainly into state.urls to avoid too many code paths. Kegan Dougal 2016-01-15 17:05:05 +00:00
  • 394fb2373b more layout tweaks for RoomSettings Matthew Hodgson 2016-01-15 16:50:12 +00:00
  • a849955c51 Merge pull request #93 from matrix-org/registration_field_validate David Baker 2016-01-15 16:38:46 +00:00
  • 90184235bb improve RoomSettings layout Matthew Hodgson 2016-01-15 16:33:50 +00:00
  • f476150591 fix changeavatar to avoid duplicate click on label Matthew Hodgson 2016-01-15 16:33:34 +00:00
  • eb8064f961 fix cursors for changeavatar Matthew Hodgson 2016-01-15 16:32:39 +00:00
  • 531aa153bb no more textarea in roomsettings Matthew Hodgson 2016-01-15 16:32:23 +00:00
  • d7ffe70d44 PushRules settings: Applied Amandine's review comments manuroe 2016-01-15 17:28:57 +01:00
  • ecfdd3593c Validate everything on form submit. Don't use pwd1 where we didn't define it & fix some error codes. David Baker 2016-01-15 16:17:27 +00:00
  • d8d79722ac Make RoomAvatar use BaseAvatar Kegan Dougal 2016-01-15 16:13:25 +00:00
  • 17489ae350 s/MemberAvatar/BaseAvatar/ and rename classes Kegan Dougal 2016-01-15 16:12:28 +00:00
  • 6bd09512de Merge pull request #94 from matrix-org/share_history_invite_warning David Baker 2016-01-15 15:57:42 +00:00
  • 293f5c7120 shrink auxpanel a bit for roomsettings Matthew Hodgson 2016-01-15 15:53:53 +00:00
  • 0caf5e0cdc manage permissions on whether people can actually edit name, topic, avatar etc or not Matthew Hodgson 2016-01-15 15:51:40 +00:00
  • 57e62bf0ba remove change avatar from here as it's now in the header Matthew Hodgson 2016-01-15 15:50:38 +00:00
  • 762dd69f0a more bottom margin on editable roomheader Matthew Hodgson 2016-01-15 15:48:29 +00:00
  • cb8b052dc0 PushRules settings: Show unmanaged rules into an "advanced section" manuroe 2016-01-15 16:45:27 +01:00
  • 1fcb4ba94f droptarget and usersettings and roomsettings layout tweaks Matthew Hodgson 2016-01-15 15:26:00 +00:00
  • aefecfc645 tweak roomheader layout when editing Matthew Hodgson 2016-01-15 15:23:41 +00:00
  • b8afccd445 fix droptarget behaviour Matthew Hodgson 2016-01-15 15:23:02 +00:00
  • 2638ee974e Add warning on inviting a user if sharing history with new users. David Baker 2016-01-15 15:18:55 +00:00
  • 80c2361805 Merge pull request #92 from matrix-org/invalid_user_name David Baker 2016-01-15 14:33:45 +00:00
  • 4a2c2d9656 fix broken merge and revert some of 243b2e45 and document evil magic numbers Matthew Hodgson 2016-01-15 14:22:17 +00:00
  • ea6ed81517 Merge pull request #630 from vector-im/read_marker_position David Baker 2016-01-15 13:57:25 +00:00
  • b60d14a408 Merge pull request #91 from matrix-org/show_upload_in_current_room_only David Baker 2016-01-15 13:45:23 +00:00
  • 02e41450b4 Do (more) client side validation of registration parameters. David Baker 2016-01-15 13:31:41 +00:00
  • 2dd2acd4e0 PushRules settings: BF adding a keyword when the keywords rule is OFF manuroe 2016-01-15 14:28:50 +01:00
  • 7cc5925ec4 increase initialSyncLimit enormously to avoid slow gappy /syncs for now Matthew Hodgson 2016-01-15 13:28:41 +00:00
  • f2dc1e835b placeholder for displayname Matthew Hodgson 2016-01-15 13:11:37 +00:00
  • e1e46be220 apply gemini scrollbar Matthew Hodgson 2016-01-15 13:11:14 +00:00
  • 828b1f4837 fix up look and feel of UserSettings a bit more Matthew Hodgson 2016-01-15 12:35:30 +00:00
  • 84b46dae4e make ChangeAvatar customisable size... Matthew Hodgson 2016-01-15 12:35:18 +00:00
  • 8e9e33fa2a fix NPE and make enter work again Matthew Hodgson 2016-01-15 12:34:53 +00:00
  • 41ae851df4 fix up user settings CSS somewhat Matthew Hodgson 2016-01-15 12:34:01 +00:00