Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 14:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,546 Commits 206 Branches 552 Tags 519 MiB
fba4b7235f
Commit Graph

56 Commits

Author SHA1 Message Date
David Baker
f928be6f59 Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental" 
This reverts commit ad47144355.
 2019-01-03 15:37:03 -07:00
David Baker
7d161de35b Partial merge of develop to experimental 
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
 2019-01-03 15:02:58 +00:00
Michael Telatynski
0a638cd545
move nag bar clear statement to any desktop notif toggle not just 0->1 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-01 23:48:00 +01:00
David Baker
d6b3083c2f Don't notify for bad encrypted messages 
Continue to wait for decryption if the decryption process failed.
Because we weren't doing this, the first message in a megolm session
was generally failing to decrypt the first time because the keys often
arrive after the message.

Fixes https://github.com/vector-im/riot-web/issues/6284

This is is small & safe enough that we may want to consider
putting it in 0.14 if we're cutting another RC.
 2018-03-29 18:18:53 +01:00
Travis Ralston
6f674f21f6 Hide the notification nag bar after enabling notifications 
and add a bit of documentation around why the notificationsEnabled setting isn't set here.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-25 13:27:23 -07:00
Travis Ralston
c7d8f3931f Revert notification toolbar setting 
It isn't a setting.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-08 17:06:36 -07:00
Travis Ralston
7ce4316cc8 Initial support for notification settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 21:47:18 -07:00
Travis Ralston
c55ffe1be7 Remove duplicate declaration that breaks the build 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:41:02 -06:00
Matthew Hodgson
d63a25a183 Merge branch 'develop' into t3chguy/hide_notification_body 2017-10-14 23:10:01 +01:00
Luke Barnard
d3f9a3aeb5 Run eslint --fix 
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
 2017-10-11 17:56:17 +01:00
Michael Telatynski
d1af424b3f
allow hiding of notification body for privacy reasons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 10:56:08 +01:00
Luke Barnard
890218fa96 Merge pull request #1339 from matrix-org/dbkr/fix_spurious_notifications 
Fix spurious notifications
 2017-08-29 14:57:11 +01:00
David Baker
acbcc00016 Remove unnecessary 'load' on notif audio element 
It's not necessary to explicitly load and it throws an exception
if you call it while the element is playing, so better to just
remove it.
 2017-08-26 15:15:51 +01:00
David Baker
b15bbc8f9d copyright 2017-08-25 13:35:04 +01:00
David Baker
d63a0d30c8 Fix spurious notifications 
When loading new content whilst scrolling down the timeline .

Use the Event event which only fire for events received in a sync,
rather than Room.timeline which fires for events from pagination
too.
 2017-08-25 13:18:01 +01:00
David Baker
db011e7065 Get variable name right 2017-08-24 14:42:38 +01:00
David Baker
939889705e Fix notifications for encrypted events (#1336) 
Remember events that we may need to notify for once decrypted and
evaluate them in an Event.decrypted listener.
 2017-08-24 14:27:38 +01:00
Michael Telatynski
bf98c0da7c
un-i18n Modal Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-27 17:19:18 +01:00
Michael Telatynski
8cfa3bc235 add concept of platform handling loudNotifications (bings/pings/whatHaveYou) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-31 23:49:55 +01:00
Michael Telatynski
b9457a0681 Track Notifier events so we know what % have toolbar/enabled/etc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 19:15:52 +01:00
David Baker
6c41be3c14 Missed OKs 2017-05-25 18:23:15 +01:00
David Baker
5c359e63ab Bulk change counterpart imports 
to use languageHandler wrapper func
 2017-05-25 11:39:08 +01:00
David Baker
d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00
Michael Telatynski
47827e0b81 un-eat the space 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-28 01:00:50 +01:00
Michael Telatynski
c9c72036f3 Change wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-28 01:00:10 +01:00
Michael Telatynski
5e8b43f3ed if we're not granted, show an ErrorDialog with some text which needs changing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-23 06:16:25 +01:00
Michael Telatynski
0590ce7faf Conform damn you (mostly) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-23 06:07:53 +01:00
David Baker
4587b5f995 Don't re-notify about messages on browser refresh 
Don't notify unless the js-sdk state is SYNCING, otherwise we'll
display notifications for messages that come in during the
incremental between the js-sdk cached data and the present.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/405
Fixes https://github.com/vector-im/riot-web/issues/3251
 2017-03-28 15:02:08 +01:00
David Baker
707fd60624 Prevent crash on login of no guest session 
The bound functions are only set when the Notifier is started, so
if stop() was called without start() having been called, the
listener function would be null which would throw an exception.
 2017-03-23 10:38:00 +00:00
David Baker
18d4d3392a Fix a bunch of linting errors 
eslint --fix and a few manual ones
 2017-01-20 14:22:27 +00:00
David Baker
28e663dd48 Pass the room object into displayNotification 
It needs it to do the view_room if the notification is clicked.
 2016-12-06 13:27:36 +00:00
David Baker
920e3346dc Move Notifications into Platform 
Also add support for clearing notifications if the Platform
supports it.
 2016-11-02 17:35:31 +00:00
Matthew Hodgson
f4d939da81 null checks on room in onRoomTimeline 2016-09-09 02:09:12 +01:00
Matthew Hodgson
4aef352a5c update to use new API based on js-sdk PR input 2016-09-08 22:48:44 +01:00
Richard van der Hoff
a12c1820df Add some comments to Notifier.js 2016-03-29 10:51:13 +01:00
Minhaz A V
6fc0aaef60 setToolbarHidden(false) if setEnabled has enable = true 
Signed-off-by: Minhaz A V <minhazav@gmail.com>
 2016-03-24 05:46:52 +05:30
Minhaz A V
8605ca134e comment removed and localStorage update moved up 
Signed-off-by: Minhaz A V <minhazav@gmail.com>
 2016-03-23 22:10:33 +05:30
Minhaz A V
8191eaa40b unwanted functions removed, prev functions modified 2016-03-23 17:26:41 +05:30
Minhaz A V
9b5519e866 promise -> callback & setToolbarPersistantHidden moved inline 
Signed-off-by: Minhaz A V <minhazav@gmail.com>
 2016-03-23 15:45:54 +05:30
Minhaz A V
cbcf23f30a funciton name changed to 
Signed-off-by: Minhaz A V <minhazav@gmail.com>
 2016-03-23 15:11:09 +05:30
Minhaz A V
818299da11 persistent = true, as default param in setToolbarHidden() method 
Signed-off-by: Minhaz A V <minhazav@gmail.com>
 2016-03-23 13:50:24 +05:30
Minhaz A V
1875377684 Some style fixes 
Signed-off-by: Minhaz A V <minhazav@gmail.com>
 2016-03-22 17:51:17 +05:30
Minhaz A V
98343a065c notification issue fixed 
Signed-off-by: Minhaz A V <minhazav@gmail.com>
 2016-03-22 03:49:46 +05:30
Matthew Hodgson
092c416a89 ugh, get rid of accidental debugging 2016-03-17 17:25:48 +00:00
Matthew Hodgson
810f72ce2c suppress notification floods again after returning from error state 2016-03-17 11:34:20 +00:00
Matthew Hodgson
380d466472 correctly fix notif spam after logout/login: https://github.com/vector-im/vector-web/issues/809 2016-03-17 02:06:47 +00:00
Richard van der Hoff
c5e03913d9 Factor out audio bings to a separate setting 
Some people are sad about bings on the desktop app. Make it turn-off-able.
 2016-03-10 10:59:40 +00:00
David Baker
69a8d65407 Don't pause the audio when we hide the notif: shouldn't be necessary and could cause sound to stop mid-way if a prior notif times out while the sound from a later one is playing. 2016-03-04 18:16:02 +00:00
David Baker
2a1e8ef39b Make audio notifs only play if the sound tweak is set 2016-03-04 15:29:33 +00:00
Andrew Johnson
3bb824484f Added very basic audio notifications. 
This plays the same message.ogg/message.mp3 regardless of event type.
It also does not check the user's event settings (LOUD/OFF/etc), instead
playing a sound upon every single notification.
Clearly, it still needs some work.

Signed-off-by: Andrew Johnson <ajohnson@draster.com>
 2016-03-04 09:07:18 -05:00