Matthew Hodgson
4293273e55
fix a bunch of i18n fails picked up by check-i18n.pl
2017-05-27 19:26:19 +01:00
David Baker
ee2a49ad41
Punctuation in translation strings
2017-05-26 13:46:01 +01:00
David Baker
2982174028
No need for repeated OKs anymore
2017-05-25 18:21:40 +01:00
David Baker
c15a66d1d4
Fix up notification settings strings
2017-05-25 17:21:41 +01:00
David Baker
ee85eb961a
Bulk change counterpart imports
...
to use react-sdk wrapper function, rather than using counterpart
directly.
2017-05-25 11:39:56 +01:00
David Baker
6b6fa59f3e
Squash merge https://github.com/vector-im/riot-web/pull/3636
2017-05-23 14:12:53 +01:00
Matthew Hodgson
40eceaf9bc
show err.message in errors if present
2017-04-23 02:22:31 +01:00
David Baker
c72a49d229
More equalses
2017-03-28 16:34:35 +01:00
David Baker
83b7f94609
Don't show phone number as target for email notifs
...
Fixes https://github.com/vector-im/riot-web/issues/3518
2017-03-28 16:24:54 +01:00
Matthew Hodgson
d639eb1049
beautify all error msgs
2017-03-12 23:26:26 +00:00
turt2live
9b42fbe42f
Expose notification option for username/MXID
...
For those unfortunate people that get pinged constantly.
2017-02-27 15:32:58 -07:00
David Baker
6b4dbfbd62
Change default brand to Riot
...
& update sample config
2016-10-04 10:23:38 +01:00
David Baker
8e4dcd9b41
Rebrand
2016-09-19 13:29:49 +01:00
Matthew Hodgson
9391dc6c2a
aargh
2016-09-19 07:41:32 -04:00
Kegan Dougal
de38a32969
Listen for close_scalar and close the dialog box when received
2016-09-19 10:37:19 +01:00
Kegsay
e2fc2b1b09
Revert "improve lipstick and support scalar logout"
2016-09-19 10:16:50 +01:00
Matthew Hodgson
af230b5fa8
improve lipstick and support scalar logout
2016-09-18 02:57:15 +01:00
Matthew Hodgson
56dfdbeb6b
call noisy notifs... noisy
2016-09-01 00:14:01 +01:00
Matthew Hodgson
eb108c7866
Merge branch 'develop' into matthew/scalar
2016-08-04 13:41:04 +01:00
Matthew Hodgson
f182e32e3d
typo
2016-07-18 01:33:36 +01:00
Matthew Hodgson
4dfb0e9a90
Merge branch 'develop' into matthew/scalar
2016-06-19 22:40:58 +01:00
David Baker
f595f6f141
This check shouldn't be here with the ||
2016-06-09 10:25:49 +01:00
David Baker
4fc311da90
Style fix
2016-06-09 09:56:11 +01:00
David Baker
f6aa9a7ea4
Make the config optional
...
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
2016-06-08 18:46:21 +01:00
David Baker
1e40fd750f
Don't use SdkConfig
...
instead take brand from a prop
2016-06-08 14:55:47 +01:00
David Baker
f9aaf7d903
Use the SdkConfig interface
...
rather than pulling in config.json directly.
json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
2016-06-06 19:13:30 +01:00
Matthew Hodgson
a2e73cceee
Merge branch 'develop' into matthew/scalar
2016-06-06 10:24:39 +01:00
Matthew Hodgson
d976046e6a
set email branding whenever emails are added from vector
2016-06-02 13:15:13 +01:00
Matthew Hodgson
c4d408d095
CSS for IntegrationsManager
2016-05-18 17:02:39 +01:00
Matthew Hodgson
ac24d6707f
Add integs mgt
2016-05-18 15:02:03 +01:00
Kegan Dougal
bc166f19b7
Fix NPE when loading the Settings page which infini-spinnered
2016-05-16 16:04:06 +01:00
Matthew Hodgson
af9838408b
s/devices/notification targets/
2016-05-04 11:58:37 +01:00
David Baker
efe1c767f0
Un-inline onChange
2016-05-03 11:36:44 +01:00
David Baker
a72d0c5b7f
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-21 10:17:15 +01:00
David Baker
3cb092051e
Merge branch 'develop' into dbkr/email_notifs
2016-04-21 10:11:55 +01:00
Matthew Hodgson
aeb438dc62
fix tbody & keying warnings
2016-04-17 17:44:04 +01:00
Matthew Hodgson
10a053019d
fix thinkos - thanks @richvdh for posthoc review
2016-04-17 17:35:17 +01:00
Matthew Hodgson
58c431abc2
fix spinner layout bouncing when changing notifs
...
all-important s/done/then/ on pushRulesPromise to ensure that the refresh completes before relaying-out the page
s/Loud/Highlight & sound/
2016-04-17 14:00:20 +01:00
Richard van der Hoff
eab206c3bd
Improve handling of notification rules we can't parse
...
* An absent rule is the same as a rule with 'enabled == false', and is not
necessarily 'OFF' (particularly in the case of the bot rule, which is
inverted).
* If we don't understand the rule, then don't tick any of the radio buttons,
and instead show it in the 'external' section.
2016-04-15 12:42:03 +01:00
Richard van der Hoff
5450223cc7
More notifications fixes
...
Fix another thing I broke during the refactor
2016-04-14 22:31:40 +01:00
Richard van der Hoff
c6b501811f
Move more stuff out of Notifications.js
2016-04-14 19:54:03 +01:00
Richard van der Hoff
ff5dff45f5
Start Notifications component refactor
...
Factor some things out of the mega Notifications component, and add a dummy
unit test to show willing
2016-04-13 18:44:41 +01:00
David Baker
5794c30def
Devices should be below 'advanced'
2016-04-13 11:35:53 +01:00
David Baker
5d9c8f3726
Support config for email notifs
...
Add support to notif settings for adding an email pusher, only for the first email address for now.
2016-04-12 16:19:20 +01:00
David Baker
356a4a4392
Typo and use CSS rather than <i>
2016-04-12 14:10:17 +01:00
David Baker
c5524851f3
Comment future possibility for deleting pushers
2016-04-12 13:22:58 +01:00
David Baker
cff1c3010b
Get & display pushers in settings
...
Really this is so (in a subsequent PR) we can show whether a user has an email pusher, but we can basically display the list of pushers for free, so adding this too.
2016-04-12 13:18:57 +01:00
Matthew Hodgson
e32299a50c
fix enable notifs text
2016-03-23 11:32:47 +00:00
Matthew Hodgson
cddfa62e27
reorder the push settings as off, on, loud - fixes https://github.com/vector-im/vector-web/issues/1117
2016-03-17 02:24:48 +00:00
Mark Haines
05e479a76c
Use then() chaining rather than manual callbacks
2016-03-16 10:59:40 +00:00
