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

7029 Commits

Author SHA1 Message Date
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
Kegsay 7e40d81a44 Merge pull request #638 from vector-im/kegan/base-avatar 
CSS for BaseAvatar
 2016-01-18 10:17:57 +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
David Baker ea6ed81517 Merge pull request #630 from vector-im/read_marker_position 
Shift read marker down by 5px
 2016-01-15 13:57:25 +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
David Baker 513c7e3b73 Uncommit unintentional config change 2016-01-13 17:59:13 +00: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 ad434cb82e GA bugfix 2016-01-13 17:33:06 +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