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
568f9bb19d
Merge pull request #713 from vector-im/dbkr/remove_member_event_rule
...
Remove member event rule as per SYN-607
2016-01-21 12:30:03 +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
0a70fe2bd1
Argh, revert accidental config commit
2016-01-21 10:30:52 +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
d979511696
Re-remove extra icons as they break favico
2016-01-20 17:20:34 +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
39eb0f9c8f
Merge pull request #687 from vector-im/push-rules-call-settings-fix
...
Fixed call push notifications settings that always stayed OFF
2016-01-20 17:06:01 +01: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
Kegsay
ad6a19a0df
Merge pull request #668 from vector-im/matthew/roompreview
...
Support non-guest peeking
2016-01-19 16:09:36 +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
37e8a35967
Merge pull request #641 from vector-im/push-rules-settings
...
Push rules settings
2016-01-18 18:25:31 +01: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
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
