gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,357 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

1009 Commits

Author SHA1 Message Date
Kegan Dougal 302c63058b Invoke onShowMoreRooms to allow parents to kick their scrollbars.. 2016-01-22 15:46:58 +00:00
Matthew Hodgson 0ee1892a0b truncate room list 2016-01-22 15:31:42 +00:00
David Baker e11ae99a9f Add vector rules with the appropriate kind, otherwise the room_message rule takes precedence over content / display name rules etc and prevents bings. 2016-01-22 14:12:29 +00:00
manuroe ce45f0b1e6 Push settings: Use a dont_notify rule when 1:1 or group chat rooms are set to OFF 2016-01-22 09:30:31 +01:00
Matthew Hodgson a76167d175 correct layout for truncated lists 2016-01-21 17:38:46 +00:00
manuroe f3064a2994 Put back removing of "When people join or leave a room" settings push rule 2016-01-21 16:37:17 +01:00
manuroe 029cf754ee Added notif settings for "Messages sent by bot" (https://github.com/vector-im/vector-web/issues/692) 
In order to do that, the rules definitions have been update to support "dont_notify" hs default push rules
 2016-01-21 16:16:44 +01:00
David Baker 1a248c8e5c Merge pull request #710 from vector-im/unread_sync 
Use read receipts to calculate unread room status
 2016-01-21 13:29:49 +00:00
David Baker b913e72735 Remove member event rule as per SYN-607 2016-01-21 12:01:28 +00:00
David Baker 4d4c6e06ec Merge remote-tracking branch 'origin/develop' into unread_sync 2016-01-21 10:39:35 +00:00
David Baker 2d917910da Merge pull request #556 from vector-im/notif_sync 
Use unread count for room highlight state
 2016-01-21 10:31:46 +00:00
David Baker a08d00c672 Apply patch to the right branch: update for new count format 2016-01-21 10:20:45 +00:00
Matthew Hodgson bd75234a2f make CSS work on FF 2016-01-21 00:39:26 +00:00
Matthew Hodgson 6573ba8c20 fix up Start Chat behaviour as per Amandine's feedback 2016-01-21 00:16:26 +00:00
Matthew Hodgson f4a2b6ab7e Merge pull request #697 from vector-im/matthew/roompreview 
Lots of CSS bugfixes and polishing
 2016-01-20 22:32:08 +00:00
Matthew Hodgson 6117e09a3f implement the correct design for memberlist 2016-01-20 22:04:32 +00:00
Matthew Hodgson 1fd60f1e44 revert read marker css 2016-01-20 17:23:33 +00:00
David Baker ac2e69ba28 Use new unread count methods 2016-01-20 17:20:19 +00:00
Matthew Hodgson 48052415b7 usersettings button layout 2016-01-20 17:09:53 +00:00
Matthew Hodgson e87e22a438 rhsbutton 2016-01-20 17:06:13 +00:00
Matthew Hodgson 5b2f921190 Fix bold avatar letters 2016-01-20 17:01:19 +00:00
Matthew Hodgson b830f43371 remove RoomAvatar; stale border-radius; fix aliases table 2016-01-20 16:59:53 +00:00
Matthew Hodgson 6332e3908e roomsettings css fixes 2016-01-20 16:39:14 +00:00
Matthew Hodgson 82742f9f13 oops, fix tinted read up to marker correctly 2016-01-20 16:06:35 +00:00
manuroe 888fde0f53 Fixed call push notifications settings that always stayed OFF 2016-01-20 17:01:09 +01:00
David Baker eb62456007 Update for new unread count format 2016-01-20 15:58:21 +00:00
Matthew Hodgson 60d2d45255 readd in the .mx_EntityTile_power class. don't understand why it was killed :'( 2016-01-20 15:39:42 +00:00
Matthew Hodgson 6ecdb02e81 sanitize avatar border radii 2016-01-20 15:26:48 +00:00
Matthew Hodgson 4d3918109a skin new invite UI CSS 2016-01-20 14:58:27 +00:00
Matthew Hodgson 9a9db53e0a fix tinting of read marker again 2016-01-20 14:58:17 +00:00
Matthew Hodgson 3e8c6a42d3 roomsettings layout tweaks 2016-01-18 19:58:02 +00:00
Matthew Hodgson 3b8e5073b5 improve layout 2016-01-18 19:57:32 +00:00
Matthew Hodgson a775086e81 wording from amandine 2016-01-18 19:57:17 +00:00
Matthew Hodgson d5c291ae62 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-18 18:00:58 +00:00
Matthew Hodgson d6f6f32c74 WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now 2016-01-18 17:37:13 +00:00
Kegan Dougal 317e1fb9cd Merge branch 'develop' into kegan/invite-search 2016-01-18 17:33:26 +00:00
manuroe 6182c983ab PushRules settings: Applied review remarks (2/2) 2016-01-18 18:24:53 +01:00
Kegan Dougal ac4b221690 More CSS fun for border bottom 2016-01-18 17:22:02 +00:00
manuroe fdf5b0a4fc Merge branch 'develop' into push-rules-settings 
# Conflicts:
#	src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
 2016-01-18 18:14:20 +01:00
manuroe 7c0fffa79b PushRules settings: Applied easy review remarks 2016-01-18 18:07:33 +01:00
Kegan Dougal fef02f2fd1 s/MemberTile/EntityTile/ 2016-01-18 16:43:00 +00:00
manuroe 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.
 2016-01-18 16:41:48 +01:00
manuroe ae14210763 PushRules settings: Put keywords in the right position 2016-01-18 16:31:18 +01:00
manuroe 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.
 2016-01-18 16:24:06 +01:00
Matthew Hodgson 0ef03c5ca4 Merge pull request #653 from vector-im/matthew/roomsettings2 
Finish off RoomSettings (part 2)
 2016-01-18 13:39:55 +00:00
Matthew Hodgson 5a1b0a1dab Merge pull request #657 from vector-im/matthew/memberlist 
Fix up MemberList and MemberInfo cosmetics a bit
 2016-01-18 13:39:42 +00:00
Kegan Dougal 77621fe035 Add missing CSS from #638 2016-01-18 12:06:46 +00:00
Matthew Hodgson 8792be4db2 moar space 2016-01-18 01:25:57 +00:00
Matthew Hodgson 1fef91b82c MemberInfo lipstick 2016-01-18 01:18:11 +00:00
Matthew Hodgson b2a1c89e83 bring back power badges 2016-01-18 00:16:04 +00:00
Matthew Hodgson 40d2018c17 fix checkbox css 2016-01-17 12:26:54 +00:00
Matthew Hodgson a61afa0f31 fix css thinko 2016-01-17 02:46:22 +00:00
Matthew Hodgson 4e7c58e242 fix broken icon 2016-01-17 02:46:15 +00:00
Matthew Hodgson 8771369937 more layout 2016-01-15 20:29:44 +00:00
Matthew Hodgson 394fb2373b more layout tweaks for RoomSettings 2016-01-15 16:50:12 +00:00
Matthew Hodgson eb8064f961 fix cursors for changeavatar 2016-01-15 16:32:39 +00:00
Matthew Hodgson 531aa153bb no more textarea in roomsettings 2016-01-15 16:32:23 +00:00
manuroe d7ffe70d44 PushRules settings: Applied Amandine's review comments 2016-01-15 17:28:57 +01:00
Kegan Dougal 17489ae350 s/MemberAvatar/BaseAvatar/ and rename classes 2016-01-15 16:12:28 +00:00
Matthew Hodgson 762dd69f0a more bottom margin on editable roomheader 2016-01-15 15:48:29 +00:00
manuroe cb8b052dc0 PushRules settings: Show unmanaged rules into an "advanced section" 2016-01-15 16:45:27 +01:00
Matthew Hodgson 1fcb4ba94f droptarget and usersettings and roomsettings layout tweaks 2016-01-15 15:26:00 +00:00
manuroe 2dd2acd4e0 PushRules settings: BF adding a keyword when the keywords rule is OFF 2016-01-15 14:28:50 +01:00
Matthew Hodgson 41ae851df4 fix up user settings CSS somewhat 2016-01-15 12:34:01 +00:00
manuroe c3469b5b51 PushRules settings: coding: separate UI and data management 2016-01-15 11:33:54 +01:00
manuroe 7412fc7f97 PushRules settings: changed wordings 2016-01-15 10:51:42 +01:00
Matthew Hodgson d1f26e3911 camera icon 2016-01-14 17:26:16 +00:00
Matthew Hodgson c1aac1aaca roomsetting icons 2016-01-14 17:25:21 +00:00
Matthew Hodgson f2fa9fe398 Merge branch 'develop' into matthew/roomsettings2 2016-01-14 16:49:48 +00:00
David Baker a65a15e9bb Shift read marker down by 5px 2016-01-14 16:45:13 +00:00
Matthew Hodgson 9ada5f7ddd CSS for tab complete slashcommands 2016-01-14 16:29:03 +00:00
Matthew Hodgson 17e540d372 fix line wrapping of code blocks in multiline msgs 2016-01-14 11:57:07 +00:00
Kegsay db2d7fdbff Merge pull request #622 from vector-im/kegan/3pid-invite-memberlist 
CSS for email invite memberlist fix
 2016-01-14 10:45:50 +00:00
Kegan Dougal 927ac5fe64 2016 only 2016-01-14 10:45:38 +00:00
manuroe 378f4bb85c PushRules settings: Display keywords in alphabetical order 2016-01-14 11:15:59 +01:00
manuroe 0577edb055 PushRules settings: Added master push rule 2016-01-14 11:03:51 +01:00
Matthew Hodgson 56718650b9 fix comedy double-margin caused by killing off MessageTiles 2016-01-13 17:39:57 +00:00
Matthew Hodgson e3eef45684 fix comedy double-margin caused by killing off MessageTiles 2016-01-13 17:39:49 +00:00
Matthew Hodgson 68f846e129 Merge branch 'develop' into matthew/roomsettings2 2016-01-13 17:33:32 +00:00
Matthew Hodgson f2171c11f0 uncommitted WIP roomsetting CSS 2016-01-13 17:33:03 +00:00
manuroe 629883731e PushRules settings: BF when adding a new keyword with the keywords rule in Off 2016-01-13 17:56:59 +01:00
manuroe 0475bcd9de PushRules settings: BF when changing state of the keywords rule with such a sequence: on -> off -> loud. 2016-01-13 17:10:26 +01:00
Kegan Dougal 1d5e661bd0 Split out css for new PresenceLabel 2016-01-13 15:56:44 +00:00
manuroe ac87830e4e PushRules settings: Applied new wordings: On, Loud, Off 2016-01-13 16:48:22 +01:00
manuroe 7fc5ab3c6e PushRules settings: Use the new TextInputDialog to display keywords list. We earn the focus at the end of the keywords list and the management of enter and esc keys 2016-01-13 16:36:57 +01:00
manuroe c4cb37606b PushRules settings: Added sanity checks on new keywords 2016-01-13 15:47:00 +01:00
manuroe e5b7a47fee PushRules settings: if a newly typed keyword was part of a push rule not managed by the Vector UI, delete the rule and create it compliant with Vector parameters 2016-01-13 12:00:04 +01:00
manuroe 1c03c208e1 PushRules settings: update keywords list hs side 2016-01-13 11:46:13 +01:00
Kegsay 7232659195 Merge pull request #612 from vector-im/kegan/guest-peek-then-join 
Add css for room preview bar.
 2016-01-13 10:37:13 +00:00
manuroe 10d3076d6b PushRules settings: Display keywords modal dialog 2016-01-13 09:11:56 +01:00
David Baker cae3ab410f Merge pull request #603 from vector-im/read_marker_animate 
New CSS for read markers
 2016-01-12 17:58:36 +00:00
Kegan Dougal 2bada93fdc CSS for forgot password link 2016-01-12 16:39:29 +00:00
manuroe 9fb8c9f67a PushRules settings: Use a workaround for SYN-590 (Push rule update fails) 2016-01-12 17:33:57 +01:00
manuroe b9080c770d PushRules settings: Fixed triage of matrix content rules into the unique Vector rule 2016-01-12 16:46:27 +01:00
David Baker 977b223929 Hopefully working CSS that doesn't cause the messages to jump about when a read marker disappears. 2016-01-12 14:20:05 +00:00
manuroe 7f95362dd2 PushRules settings: Translate matrix per-word rules into the global Vector rule for a list of keywords 2016-01-12 15:12:58 +01:00
Kegan Dougal f706f75a6e Add css for room preview bar. 2016-01-12 14:11:00 +00:00
Matthew Hodgson fc3f356dc0 GA 2016-01-12 01:23:39 +00:00
manuroe 6d510db2db PPushRules settings: Fixed React warnings 2016-01-11 17:32:37 +01:00
manuroe ee13dd7b6c PushRules settings: Added a dedicated component to display them 2016-01-11 17:24:04 +01:00