David Baker
4462694438
lint
2017-12-06 16:06:33 +00:00
David Baker
65c210cdde
Warn when migrating e2e data to indexeddb
2017-12-06 15:28:20 +00:00
Luke Barnard
b26cf23574
Merge pull request #1641 from matrix-org/luke/tag-panel-shift-click-semantics
...
Implement shift-click and ctrl-click semantics for TP
2017-12-01 12:04:21 +00:00
Luke Barnard
363fe04a10
isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent
2017-12-01 10:44:00 +00:00
Luke Barnard
ddd0e161c0
Fix broken imports
2017-12-01 10:41:56 +00:00
Luke Barnard
fe81fcb8c6
Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
...
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
Luke Barnard
eaaa9fe747
Don't show group when clicking tag panel
2017-11-30 15:35:40 +00:00
Luke Barnard
3bcb3195c4
Implement shift-click and ctrl-click semantics for TP
2017-11-30 14:48:54 +00:00
Luke Barnard
f708250d44
Add feature flag for Tag Panel
2017-11-29 18:00:42 +00:00
Luke Barnard
ead30fae9d
Use unmounted instead of mounted
2017-11-29 17:07:43 +00:00
Luke Barnard
45bcb6f2ed
Implement TagPanel (or LeftLeftPanel) for group filtering
...
This allows for filtering of the RoomList by group. When a group is selected, the room list will show:
- Rooms in the group
- Direct messages with members in the group
A button at the bottom of the TagPanel allows for creating new groups, which will appear in the panel following creation.
2017-11-29 16:53:43 +00:00
Luke Barnard
55b5f2b249
Merge branch 'develop' into luke/allow-guest-view-group
2017-11-28 14:06:43 +00:00
Luke Barnard
a8594a58e5
Allow guest to see MyGroups, show ILAG when creating a group
2017-11-28 13:32:46 +00:00
Luke Barnard
7ec4010881
Make GroupStore use MatrixClientPeg
...
To avoid weirdness with using a cached matrix client
2017-11-28 11:54:05 +00:00
Luke Barnard
1a3ad5a342
Allow guests to view individual groups
...
For homeservers that still disallow guests (running synapse without https://github.com/matrix-org/synapse/pull/2715 ), start ILAG.
2017-11-28 11:52:46 +00:00
David Baker
bbaa46f773
Merge pull request #1634 from matrix-org/luke/move-group-flair-toggle-to-user-settings
...
Move group publication toggles to UserSettings
2017-11-28 11:02:45 +00:00
Richard van der Hoff
8be3862e68
Merge branch 'master' into develop
2017-11-28 10:29:40 +00:00
David Baker
81ae081f15
Merge pull request #1617 from turt2live/travis/granular-theme
...
Pull the theme through the default process
2017-11-27 18:07:09 +00:00
lukebarnard
9ed9422af8
Move group publication toggles to UserSettings
2017-11-27 17:24:42 +00:00
Richard van der Hoff
80b8cbb473
Ignore unrecognised login flows
...
Update the Login component so that if it sees an unrecognised login flow, it
just ignores it and uses another one, so that riot can still be used with
homeservers supporting custom login types.
2017-11-27 16:47:49 +00:00
David Baker
1675737e7d
Merge remote-tracking branch 'origin/master' into develop
2017-11-17 17:48:42 +00:00
David Baker
6d23182f5f
Fix the force TURN option
...
The call object is created within the js-sdk for inbound calls, so
we never got the chance to set it.
2017-11-17 14:54:44 +00:00
Travis Ralston
33a3b07d88
Pull the theme through the default process
...
This is to ensure the `config` level is respected.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-16 20:52:12 -07:00
Luke Barnard
b54e563cb6
Merge branch 'develop' into luke/linting-keyword-spacing
2017-11-16 13:23:42 +00:00
Luke Barnard
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
Matthew Hodgson
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00: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
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
Matthew Hodgson
060a890275
Merge pull request #1516 from turt2live/travis/granular-settings
...
Granular settings
2017-11-15 10:55:55 +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
Travis Ralston
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
Matthew Hodgson
546b062d82
automatically and correctly retint when changing theme
2017-11-15 01:45:51 +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
df6d5cc2b4
Pass plain components, rather than functions returning them
2017-11-14 20:09:52 +01:00
Matthew Hodgson
7c98558b6a
fix neglible race when loading CSS
2017-11-14 16:07:48 +00:00
Matthew Hodgson
1fd7ac30e4
turns out i made up the .complete property on link elements
2017-11-14 16:04:11 +00:00
Matthew Hodgson
8d6e3dd27d
fix lint
2017-11-14 15:37:03 +00:00
Matthew Hodgson
dcfbe93409
fix race when loading CSS
...
fixes https://github.com/vector-im/riot-web/issues/5590
2017-11-14 15:28:34 +00:00
Matthew Hodgson
8c218557df
fix disable_custom_urls
2017-11-14 15:17:50 +00:00
David Baker
55260becc9
Revert "Lowercase all usernames"
2017-11-14 14:13:22 +00:00
Travis Ralston
d92cba25ef
Use the SettingsStore to get the theme
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 13:14:00 -07:00
Travis Ralston
63bebe9dfd
Split out avatar and display name hiding
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 12:58:10 -07:00
Travis Ralston
0648b3eae7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:29:36 -07:00
Stefan Parviainen
3afbaf61e7
Refactor i18n stuff a bit
2017-11-13 20:19:33 +01:00
Travis Ralston
c5c346f0b7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:18:41 -07:00
Matthew Hodgson
46387e135e
Merge branch 'develop' into matthew/status
2017-11-11 23:50:48 +00:00
Matthew Hodgson
2827bc0718
replace some of the status.im theme with general config options
2017-11-11 23:46:43 +00:00
David Baker
39763d668c
Revert "Lowercase all usernames"
2017-11-11 15:59:43 +00:00
Matthew Hodgson
a0cdaf29f9
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-10 15:29:42 -08:00