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
d976046e6a
set email branding whenever emails are added from vector
2016-06-02 13:15:13 +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
Matthew Hodgson
fdf83a5ad5
fix tooltip offset
2016-04-15 22:24: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
efd01d6929
move localstorage crap entirely to TextualBody
2016-04-11 23:54:00 +01:00
Matthew Hodgson
cdc89c0623
add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback
2016-04-08 21:42:42 +01:00
Matthew Hodgson
d107151f8a
rename size prop as fileSize, add comments, and honour explicit properties rather than mxEvent fields
2016-04-07 18:10:15 +01:00
Matthew Hodgson
d7eb23db53
specify sizes and hyperlinks for non-event images
2016-04-04 00:16:52 +01:00
Matthew Hodgson
333f1e46ca
document properties and remove spurious 'view full screen' button
2016-04-03 23:57:44 +01:00
Matthew Hodgson
d414127f80
track whether widget should be hidden on the event, as well as persisting it in localStorage
2016-04-03 23:31:42 +01:00
Matthew Hodgson
ff2885087d
support cancelling and uncancelling previews
2016-04-03 02:50:51 +01:00
Aviral Dasgupta
cf17ea6254
Show full-size avatar on MemberInfo avatar click
...
fixes vector-im/vector-web#65
2016-04-03 00:53:17 +05:30
Matthew Hodgson
512a9125bf
fix zalgos in SenderProfile again, whilst maintaining limited-width name via inline-block. and without doubling emote vertical space...
2016-03-30 19:47:06 +01:00
Matthew Hodgson
e32299a50c
fix enable notifs text
2016-03-23 11:32:47 +00:00
Matthew Hodgson
d4a36f5081
permalink button
2016-03-19 23:26:04 +00:00
Matthew Hodgson
19cb06d040
prop fix
2016-03-18 20:08:31 +00:00
Matthew Hodgson
aca4457a89
apparently we don't need a default onClick
2016-03-17 17:00:58 +00:00
Matthew Hodgson
d7a851a353
make senderprofiles clickable
2016-03-17 16:28:49 +00:00
Matthew Hodgson
c6f95dfb3b
Merge pull request #1180 from vector-im/matthew/fix-notif-spam
...
fix notif spam when logging in from a guest session by correctly logging out first.
2016-03-17 14:37:21 +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
Matthew Hodgson
a6e3b39f16
fix notif spam on launch by correctly logging out again. reverts start_login_from_guest stuff
2016-03-17 02:08:05 +00:00
Matthew Hodgson
50d18ac771
Merge pull request #1165 from vector-im/matthew/cancellable-upgrade
...
use new start_login_from_guest dispatch for cancellable logins from guest accounts
2016-03-16 14:37:50 +00:00
Mark Haines
05e479a76c
Use then() chaining rather than manual callbacks
2016-03-16 10:59:40 +00:00
Matthew Hodgson
cb45db36c2
use new start_login_from_guest dispatch for cancellable logins from guest accounts
2016-03-15 21:02:25 +00:00
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
