6182c983ab
PushRules settings: Applied review remarks (2/2)
2016-01-18 18:24:53 +01:00
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
7c0fffa79b
PushRules settings: Applied easy review remarks
2016-01-18 18:07:33 +01: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.
2016-01-18 16:41:48 +01:00
ae14210763
PushRules settings: Put keywords in the right position
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.
2016-01-18 16:24:06 +01:00
0ef03c5ca4
Merge pull request #653 from vector-im/matthew/roomsettings2
...
Finish off RoomSettings (part 2)
2016-01-18 13:39:55 +00:00
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
77621fe035
Add missing CSS from #638
2016-01-18 12:06:46 +00:00
7e40d81a44
Merge pull request #638 from vector-im/kegan/base-avatar
...
CSS for BaseAvatar
2016-01-18 10:17:57 +00:00
8792be4db2
moar space
2016-01-18 01:25:57 +00:00
1fef91b82c
MemberInfo lipstick
2016-01-18 01:18:11 +00:00
b2a1c89e83
bring back power badges
2016-01-18 00:16:04 +00:00
40d2018c17
fix checkbox css
2016-01-17 12:26:54 +00:00
a61afa0f31
fix css thinko
2016-01-17 02:46:22 +00:00
4e7c58e242
fix broken icon
2016-01-17 02:46:15 +00:00
8771369937
more layout
2016-01-15 20:29:44 +00:00
394fb2373b
more layout tweaks for RoomSettings
2016-01-15 16:50:12 +00:00
eb8064f961
fix cursors for changeavatar
2016-01-15 16:32:39 +00:00
531aa153bb
no more textarea in roomsettings
2016-01-15 16:32:23 +00:00
d7ffe70d44
PushRules settings: Applied Amandine's review comments
2016-01-15 17:28:57 +01:00
17489ae350
s/MemberAvatar/BaseAvatar/ and rename classes
2016-01-15 16:12:28 +00:00
762dd69f0a
more bottom margin on editable roomheader
2016-01-15 15:48:29 +00:00
cb8b052dc0
PushRules settings: Show unmanaged rules into an "advanced section"
2016-01-15 16:45:27 +01:00
1fcb4ba94f
droptarget and usersettings and roomsettings layout tweaks
2016-01-15 15:26:00 +00:00
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
2dd2acd4e0
PushRules settings: BF adding a keyword when the keywords rule is OFF
2016-01-15 14:28:50 +01:00
41ae851df4
fix up user settings CSS somewhat
2016-01-15 12:34:01 +00:00
c3469b5b51
PushRules settings: coding: separate UI and data management
2016-01-15 11:33:54 +01:00
7412fc7f97
PushRules settings: changed wordings
2016-01-15 10:51:42 +01:00
d1f26e3911
camera icon
2016-01-14 17:26:16 +00:00
c1aac1aaca
roomsetting icons
2016-01-14 17:25:21 +00:00
f2fa9fe398
Merge branch 'develop' into matthew/roomsettings2
2016-01-14 16:49:48 +00:00
a65a15e9bb
Shift read marker down by 5px
2016-01-14 16:45:13 +00:00
9ada5f7ddd
CSS for tab complete slashcommands
2016-01-14 16:29:03 +00:00
17e540d372
fix line wrapping of code blocks in multiline msgs
2016-01-14 11:57:07 +00:00
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
927ac5fe64
2016 only
2016-01-14 10:45:38 +00:00
378f4bb85c
PushRules settings: Display keywords in alphabetical order
2016-01-14 11:15:59 +01:00
0577edb055
PushRules settings: Added master push rule
2016-01-14 11:03:51 +01:00
513c7e3b73
Uncommit unintentional config change
2016-01-13 17:59:13 +00:00
56718650b9
fix comedy double-margin caused by killing off MessageTiles
2016-01-13 17:39:57 +00:00
e3eef45684
fix comedy double-margin caused by killing off MessageTiles
2016-01-13 17:39:49 +00:00
68f846e129
Merge branch 'develop' into matthew/roomsettings2
2016-01-13 17:33:32 +00:00
ad434cb82e
GA bugfix
2016-01-13 17:33:06 +00:00
f2171c11f0
uncommitted WIP roomsetting CSS
2016-01-13 17:33:03 +00:00
629883731e
PushRules settings: BF when adding a new keyword with the keywords rule in Off
2016-01-13 17:56:59 +01:00
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
1d5e661bd0
Split out css for new PresenceLabel
2016-01-13 15:56:44 +00:00
ac87830e4e
PushRules settings: Applied new wordings: On, Loud, Off
2016-01-13 16:48:22 +01:00
manuroe