OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,856 Commits
221 Branches
563 Tags
477 MiB
Commit Graph

7856 Commits (f033ada5a35196182a89783b928a99b6b20d8a52)

Author SHA1 Message Date
Travis Ralston 5976fb2eed Treat null/undefined notification settings as "not set" 
Otherwise we end up lying and saying notifications are disabled, despite the push rules saying otherwise.

Part 1 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 22:08:13 -07:00
Travis Ralston 10a1d9cb29 Language is a local setting 
Fixes https://github.com/vector-im/riot-web/issues/5611

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 21:16:12 -07:00
Travis Ralston f141ee1944 Use the correct level order when getting arbitrary settings 
This shouldn't currently be causing problems, but will in teh future. The bug can be exposed by having a setting where the level order is completely reversed, therefore causing LEVEL_ORDER[0] to actually be the most generic, not the most specific. Instead, we'll pull in the setting's level order and fallback to LEVEL_ORDER, therefore requesting the most specific value.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 19:24:32 -07:00
Travis Ralston cf8ff6aed3 Validate that URL previews are explicitly enabled/disabled 
Otherwise `!null` ends up being "true", therefore forcing URL previews on for everyone.

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

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 19:22:30 -07:00
Travis Ralston 022e40a127 Use SettingsStore for default theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 19:04:49 -07:00
Stefan Parviainen 2c1618bc10 Fix conflict and update strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-15 20:40:51 +01:00
Szimszon 0596925a86 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-11-15 19:05:56 +00:00
Weblate 80b1a685a6 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 18:34:56 +00:00
Andrey 45a90ef038 Translated using Weblate (Russian) 
Currently translated at 98.3% (917 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-15 18:34:56 +00:00
Bamstam 1f1ca15219 Translated using Weblate (German) 
Currently translated at 98.9% (922 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-15 18:34:55 +00:00
Richard Lewis 5104ebfd29
Merge pull request #1611 from matrix-org/rxl881/invertOutlineColour 
Make TintableSvg links behave like normal image links
 2017-11-15 18:34:51 +00:00
Kévin C 648be26fb7 Translated using Weblate (French) 
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-11-15 16:27:32 +00:00
Michael Telatynski c0002e7778
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events 2017-11-15 16:03:07 +00:00
Michael Telatynski 5563b71c47
differentiate between state events and message events 
so that people can't fake state event types and have them rendered.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-15 15:56:54 +00:00
Richard Lewis 750e64deee Pass required props to TintableSvg. 2017-11-15 15:17:21 +00:00
Richard Lewis 24b9269ff5 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour 2017-11-15 15:08:28 +00:00
Weblate c5b5a78e86 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 14:47:28 +00:00
Matthew Hodgson f4ecc7fa5d speculatively fix @lampholder's NPE 2017-11-15 14:47:20 +00:00
Weblate e06ff8083d Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 14:30:40 +00:00
Matthew Hodgson ec33806379
Merge pull request #1610 from matrix-org/rxl881/lintingErrors 
Fix linting errors.
 2017-11-15 14:30:36 +00:00
Richard Lewis 7bab7813bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour 2017-11-15 13:26:29 +00:00
Richard Lewis 59d405d4fa Use TintableSvgButtons for widget menubar icons. 2017-11-15 13:24:38 +00:00
Richard Lewis 6c2e9096cd Tintable SVGs that behave like normal image buttons / links. 2017-11-15 13:08:24 +00:00
Weblate 072a3cd622 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 11:26:05 +00:00
Matthew Hodgson 96a3eff5d3 lint hell 2017-11-15 11:25:56 +00:00
Weblate 0847596083 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 11:15:57 +00:00
Matthew Hodgson 84591729a8 unbreak tests 2017-11-15 11:15:49 +00:00
Weblate 023549a528 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 11:02:12 +00:00
Luke Barnard a63c491220 Merge branch 'master' into develop 2017-11-15 11:02:02 +00:00
Luke Barnard 6fd09bc09a v0.11.0 2017-11-15 11:01:29 +00:00
Luke Barnard bb2bc6ac08 Prepare changelog for v0.11.0 2017-11-15 11:01:29 +00:00
Luke Barnard 9df169b500 Bump js-sdk to release 0.9.0 2017-11-15 10:59:06 +00:00
Weblate 6e74657d41 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 10:56:01 +00:00
Matthew Hodgson 060a890275
Merge pull request #1516 from turt2live/travis/granular-settings 
Granular settings
 2017-11-15 10:55:55 +00:00
Richard Lewis 56a70f5530 Add tinting for lowlights. 2017-11-15 10:40:07 +00:00
Richard Lewis 06b319937f Fix linting errors. 2017-11-15 10:14:16 +00:00
Weblate 7367a27df1 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 09:56:52 +00:00
Matthew Hodgson e91e94fd42 fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601 2017-11-15 09:56:44 +00:00
Szimszon a226a4997b Translated using Weblate (Hungarian) 
Currently translated at 100.0% (934 of 934 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-11-15 05:51:26 +00:00
Travis Ralston f58e8826c0 Use the correct settings store for presence 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-14 19:18:04 -07:00
Travis Ralston 443bff5832 Presence feature 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-14 19:14:56 -07:00
Travis Ralston bd4102eb3d Merge branch 'develop' into travis/granular-settings 2017-11-14 19:12:48 -07:00
Weblate cb32bac7fa Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 01:46:01 +00:00
Matthew Hodgson 546b062d82 automatically and correctly retint when changing theme 2017-11-15 01:45:51 +00:00
Weblate 06e38c2e48 Merge remote-tracking branch 'origin/develop' into develop 2017-11-15 01:01:24 +00:00
Bamstam 955362ee2d Translated using Weblate (German) 
Currently translated at 99.4% (929 of 934 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-15 01:01:24 +00:00
Matthew Hodgson d6fc4ebe3c fix new tinter problems 
correctly handle skinned tertiaryColors (turns out they're used for the RoomSublist divider bars)
handle the fact that some room accountData apparently has ended up with rgb() colors in it...
 2017-11-15 01:01:17 +00:00
Weblate 247df92f17 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 23:53:21 +00:00
Matthew Hodgson f05958e334
Merge pull request #1482 from turt2live/travis/presence 
Implement user-controlled presence
 2017-11-14 23:53:16 +00:00
Stefan Parviainen ae252f7e59 Log if no match is found 2017-11-14 21:34:20 +01:00