Mark Haines
31915db6f6
Remove trailing whitespace
2016-03-15 18:38:24 +00:00
Mark Haines
eb01cb9cba
Merge pull request #1037 from vector-im/markjh/change_push_actions
...
Update the actions of default rules instead of overriding.
2016-03-15 18:10:04 +00:00
Mark Haines
9b85d88036
s/somme/some/
2016-03-15 15:23:18 +00:00
Mark Haines
3224a4e49e
Add helper functions for decoding and encoding lists of push actions
2016-03-15 11:26:32 +00:00
Mark Haines
8b1444c954
Port the legacy im.vector rules to the new format on startup
2016-03-15 10:49:10 +00:00
Richard van der Hoff
e777db3fc4
Add setting for audio notifications
...
Expose the enableAudioNotifications setting in the user settings panel.
2016-03-10 11:01:29 +00:00
Matthew Hodgson
a4d22ffe8c
improve IS warning
2016-03-06 17:11:08 -05:00
David Baker
d732927dba
Re-enable upgrade registration.
...
Revert https://github.com/vector-im/vector-web/issues/818 now that https://github.com/vector-im/vector-web/issues/759 is fixed.
2016-03-04 15:42:22 +00:00
Matthew Hodgson
2586280f2c
add opera
2016-03-03 15:31:08 +00:00
Matthew Hodgson
04fb8f9a81
de-kegan the CompatibilityPage :(
2016-03-03 15:22:12 +00:00
David Baker
b03e6a8d73
add comment explaining data passing hack
2016-03-02 14:34:31 +00:00
David Baker
2271ec7634
Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS)
2016-03-02 14:24:00 +00:00
David Baker
332354e5b6
Uncommit 71cb04c50a
(I failed to branch)
2016-03-02 14:23:20 +00:00
David Baker
71cb04c50a
Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS)
2016-03-02 14:21:32 +00:00
Mark Haines
3b2d0a6c01
Fix up reading the push rules
2016-02-29 16:56:33 +00:00
Mark Haines
731d94eea4
Update the actions of default rules instead of overriding.
...
The Matrix CS API, and synapse now supports setting the actions for default
rules. Doing that makes managing the rules much simpler from a vector
persepctive since the ON/LOUD/OFF toggle buttons can be implemented by
setting the actions and enabling/disabling the default rules rather than
overidding them.
Overriding the default rules was difficult because it was not possible
to intermingle the evaluation of user-specified rules with the default
rules. So even though you could add a rule with the same conditions as a
default rule, it would evaluate before *all* the other default rules.
Also creating new rules under a im.vector namespace creates challenges
if we want vector to cooperate with other matrix clients that want to
provide a similar set of toggle switches for the push rules.
2016-02-26 20:51:16 +00:00
David Baker
55c7c08ac2
Sender can be null, so null check.
2016-02-23 17:59:13 +00:00
Matthew Hodgson
f2fc4a88ae
gemini up roomdirectory
2016-02-22 09:35:11 +00:00
Matthew Hodgson
2ca5529faa
support hyperlinked topics
2016-02-20 23:54:47 +00:00
Matthew Hodgson
a35ab6bcef
tart up room directory
2016-02-20 13:36:48 +00:00
Matthew Hodgson
3910877f8f
ensure local activity bumps rooms up the roomlist
2016-02-19 02:09:04 +00:00
Matthew Hodgson
f3df0d07f8
filter room directory case insensitively
2016-02-14 13:32:15 +02:00
David Baker
485343864c
semicolon
2016-02-05 10:57:49 +00:00
David Baker
f035b8c50e
Rate limit UI updates to avoid browser death
2016-02-04 18:09:24 +00:00
Kegsay
6c5a00162c
Merge pull request #856 from vector-im/kegan/version-stamp
...
Add a version update checker and NewVersionBar to show on the UI.
2016-02-03 17:09:24 +00:00
Kegan Dougal
5eed734325
Add a version update checker and NewVersionBar to show on the UI.
2016-02-03 16:16:14 +00:00
David Baker
d132c75263
Remove the autoPeek stuff and always either peek or show the join prompt bar
2016-02-02 15:51:23 +00:00
David Baker
d1dc082489
Remove empty if block
2016-02-01 18:02:52 +00:00
David Baker
6a36b022e4
New style guest warning bar
2016-01-28 13:00:44 +00:00
Matthew Hodgson
5e21059144
Merge pull request #729 from vector-im/matthew/truncateroomlist
...
truncate room list
2016-01-22 16:09:28 +00:00
Matthew Hodgson
0a32874b39
oops, reset truncate state on hide, not collapse
2016-01-22 16:09:06 +00:00
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
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
David Baker
ac2e69ba28
Use new unread count methods
2016-01-20 17:20:19 +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
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
manuroe
6182c983ab
PushRules settings: Applied review remarks (2/2)
2016-01-18 18:24:53 +01: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