Matthew Hodgson
eb108c7866
Merge branch 'develop' into matthew/scalar
2016-08-04 13:41:04 +01:00
Matthew Hodgson
ee9f78d156
slightly better volume labels
2016-08-03 15:49:32 +01:00
Matthew Hodgson
70754db27a
Merge pull request #1900 from vector-im/wmwragg/mention-state-menu
...
Wmwragg/mention state menu
2016-08-03 15:22:49 +01:00
Richard van der Hoff
3860488bb5
Fix notifications warning layout
...
For some reason, Chrome doesn't seem to make the central div in the
notifications warning wide enough, so it ends up wrapping. Fix this by making
the central div expand across the available space, instead of letting the
container for the close button do it.
Fixes https://github.com/vector-im/vector-web/issues/1687
2016-08-01 10:31:58 +01:00
wmwragg
55a10ee275
Mute state handled corrcectly
2016-07-28 17:25:28 +01:00
wmwragg
49545ce0c2
Leaving the fail promise section blank as a todo, with explanitary comment
2016-07-28 15:29:57 +01:00
wmwragg
b87058508e
When a use clicks the state they want, after the change has been made it pasues breifly before closing, so that the user can see their state change has taken place.
2016-07-28 15:28:05 +01:00
wmwragg
6329e274ab
Extra polish to get styling looking like the design
2016-07-28 14:20:24 +01:00
wmwragg
b5fdaac947
Final spacing tweaks to get it aligned with the design
2016-07-27 18:06:47 +01:00
wmwragg
d376df478a
Initial context menu with all it's elements
2016-07-27 17:43:35 +01:00
wmwragg
074bbc7149
Added the two additiona states that don't yet exist on the backend, as faded and disabled options
2016-07-27 12:25:44 +01:00
wmwragg
dab707a893
Additional refactor to further modularise the context menus
2016-07-27 11:26:36 +01:00
wmwragg
5cf164fcc1
Re-modularised the context menus
2016-07-27 10:40:57 +01:00
wmwragg
15f9f5dbe8
Doing the state change via onClick events rather than radio buttons, as they were causeing untraceable react errros for some reason
2016-07-26 17:24:45 +01:00
wmwragg
187818aaa0
Radio buttons now added, and only none guests can modify notfication state
2016-07-26 10:34:03 +01:00
wmwragg
2768cd2010
Initial unstyled mentions state notifier context menu
2016-07-22 17:30:09 +01:00
wmwragg
204e42494a
The default props doesn't seem to be working, hardcoded 'LABEL' for now. OnClick closes menu
2016-07-22 16:11:42 +01:00
wmwragg
633a3f4867
New component for testing
2016-07-21 17:44:05 +01:00
Matthew Hodgson
25eb2e2daf
Merge pull request #1822 from vector-im/wmwragg/spinner-fix
...
Wmwragg/spinner fix
2016-07-19 12:54:15 +01:00
wmwragg
28108476bd
Added an overide for the view source so that it behaves correctly with the new Modal. Also tweaked the spinner overide
2016-07-18 10:31:17 +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
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
