Matthew Hodgson
|
68115f5b9c
|
tint when theming correctly
|
2017-11-05 00:40:38 +00:00 |
|
Matthew Hodgson
|
8587b36715
|
Merge branch 'develop' into matthew/status
|
2017-11-04 23:51:26 +00:00 |
|
Matthew Hodgson
|
e72e30197a
|
calculate new CSS tinting when we change theme
|
2017-11-04 23:50:57 +00:00 |
|
Matthew Hodgson
|
b2ddcb8027
|
tint the colours in the theme rather than hardcode vector green
|
2017-11-04 23:43:20 +00:00 |
|
Travis Ralston
|
c7eee36990
|
Fix lanugage detection
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-04 16:38:26 -06:00 |
|
Travis Ralston
|
4f1ad974fc
|
Delay URL preview saving until the save button is pressed
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-04 16:32:13 -06:00 |
|
Travis Ralston
|
358298e4ee
|
Support room color in settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-04 16:10:25 -06:00 |
|
Travis Ralston
|
bb5f7bed85
|
Check the correct event type for the room
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-04 15:48:24 -06:00 |
|
Travis Ralston
|
a8169a682c
|
Throw errors if the setting isn't known
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-04 15:46:15 -06:00 |
|
Travis Ralston
|
257e1aabb8
|
Improve documentation of settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-04 15:44:01 -06:00 |
|
Weblate
|
ae844a048f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-04 15:42:03 +00:00 |
|
Matthew Hodgson
|
3fd5937687
|
Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing
Fixes React warning
|
2017-11-04 15:41:57 +00:00 |
|
Travis Ralston
|
8282534f87
|
Add SettingsLevel enum; Move settings to own file.
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-03 23:19:45 -06:00 |
|
Travis Ralston
|
893c39bfbe
|
Merge branch 'develop' into travis/granular-settings
|
2017-11-03 22:00:07 -06:00 |
|
Travis Ralston
|
de6fc32a87
|
Show an indicator when there are any pins in the room
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-03 20:00:48 -06:00 |
|
Travis Ralston
|
a2b7f6d30e
|
Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice
|
2017-11-03 19:57:39 -06:00 |
|
Travis Ralston
|
5c37155730
|
Don't assume we have a valid event.
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-03 18:18:09 -06:00 |
|
Travis Ralston
|
3656fdb571
|
Store read pinned events as an array to avoid racing saves.
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-11-03 18:12:57 -06:00 |
|
Weblate
|
107f83f84f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-03 22:44:22 +00:00 |
|
Matthew Hodgson
|
d4adff3d25
|
Merge pull request #1575 from matrix-org/luke/fix-flair-store-again
Fix Flair not appearing due to missing this._usersInFlight
|
2017-11-03 22:44:16 +00:00 |
|
Kévin C
|
6ddbaebb65
|
Translated using Weblate (French)
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
|
2017-11-03 19:54:40 +00:00 |
|
Luke Barnard
|
da23afdec2
|
Better comment on FlairStore _usersInFlight
|
2017-11-03 18:48:15 +00:00 |
|
Weblate
|
295bdae075
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-03 18:47:03 +00:00 |
|
Jan Kudrik
|
ed586bedbc
|
Translated using Weblate (Czech)
Currently translated at 70.0% (647 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
|
2017-11-03 18:47:02 +00:00 |
|
Luke Barnard
|
d03f2826c3
|
Merge pull request #1574 from matrix-org/luke/fix-groups-rooms-list-view-room-dispatch
Use, if possible, a room's canonical or first alias when viewing the …
|
2017-11-03 18:46:58 +00:00 |
|
Luke Barnard
|
4d8f18742b
|
Check against non-existant promise to resolve a user's groups
|
2017-11-03 18:43:43 +00:00 |
|
Luke Barnard
|
d64fc4c842
|
Fix Flair not appearing due to missing this._usersInFlight
|
2017-11-03 18:19:10 +00:00 |
|
Luke Barnard
|
58f1757f0c
|
Handle rooms with no aliases or canonical alias
|
2017-11-03 17:52:36 +00:00 |
|
Luke Barnard
|
98312a4647
|
Use, if possible, a room's canonical or first alias when viewing the room
(Only affects rooms the user has never joined)
|
2017-11-03 17:37:13 +00:00 |
|
Szimszon
|
dad5023728
|
Translated using Weblate (Hungarian)
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
|
2017-11-03 16:51:41 +00:00 |
|
Weblate
|
6796b5b70c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-03 16:15:06 +00:00 |
|
Bamstam
|
04614de139
|
Translated using Weblate (German)
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
|
2017-11-03 16:15:05 +00:00 |
|
Luke Barnard
|
abff4ee6b5
|
Merge pull request #1573 from matrix-org/luke/groups-add-style-to-create-group-dialog
Add CSS classes to group ID input in CreateGroupDialog
|
2017-11-03 16:14:59 +00:00 |
|
Luke Barnard
|
b88c13d527
|
Use prefixed class names to avoid collisions with other libraries
|
2017-11-03 16:02:41 +00:00 |
|
Luke Barnard
|
e84e4ed5f5
|
Add CSS classes to group ID input in CreateGroupDialog
|
2017-11-03 15:38:12 +00:00 |
|
Krombel
|
f96c0d8533
|
Translated using Weblate (German)
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
|
2017-11-03 15:35:45 +00:00 |
|
Matthew Hodgson
|
6747390333
|
merge
|
2017-11-03 15:12:24 +00:00 |
|
David Baker
|
49ee78dab1
|
Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills
|
2017-11-03 14:39:52 +00:00 |
|
Weblate
|
6a5162b047
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-03 14:30:06 +00:00 |
|
David Baker
|
43a23d7e89
|
Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room
Give autocomplete providers the room they're in
|
2017-11-03 14:29:59 +00:00 |
|
Weblate
|
ec8afd185f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-03 14:24:37 +00:00 |
|
David Baker
|
2c9a93a8ac
|
Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills
Fix multiple pills on one line
|
2017-11-03 14:24:33 +00:00 |
|
David Baker
|
802ab16746
|
Fix multiple pills on one line
|
2017-11-03 14:06:59 +00:00 |
|
Weblate
|
1cc65044d4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-03 13:54:04 +00:00 |
|
Luke Barnard
|
d0b3368445
|
Merge pull request #1570 from matrix-org/luke/fix-groups-invites-appearance
Fix group invites such that they look similar to room invites
|
2017-11-03 13:53:58 +00:00 |
|
Michael Telatynski
|
b2cd65e182
|
Fixes React warning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-11-03 12:30:58 +00:00 |
|
Luke Barnard
|
151f9917b1
|
Fix group invites such that they look similar to room invites
- Change GroupInviteTile to use RoomTile CSS
- Give group invites their own sub list, with heading "Community Invites"
|
2017-11-03 12:19:37 +00:00 |
|
Weblate
|
41cd3f0412
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-03 12:03:18 +00:00 |
|
Szimszon
|
fefe157c56
|
Translated using Weblate (Hungarian)
Currently translated at 100.0% (922 of 922 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
|
2017-11-03 12:03:17 +00:00 |
|
Bamstam
|
d43481d555
|
Translated using Weblate (German)
Currently translated at 99.8% (921 of 922 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
|
2017-11-03 12:03:17 +00:00 |
|