dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
060a890275
Merge pull request #1516 from turt2live/travis/granular-settings
...
Granular settings
2017-11-15 10:55:55 +00:00
e91e94fd42
fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601
2017-11-15 09:56:44 +00:00
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
546b062d82
automatically and correctly retint when changing theme
2017-11-15 01:45:51 +00:00
7c98558b6a
fix neglible race when loading CSS
2017-11-14 16:07:48 +00:00
1fd7ac30e4
turns out i made up the .complete property on link elements
2017-11-14 16:04:11 +00:00
8d6e3dd27d
fix lint
2017-11-14 15:37:03 +00:00
dcfbe93409
fix race when loading CSS
...
fixes https://github.com/vector-im/riot-web/issues/5590
2017-11-14 15:28:34 +00:00
0648b3eae7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:29:36 -07:00
c5c346f0b7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:18:41 -07:00
a0cdaf29f9
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-10 15:29:42 -08:00
0d174ffe9a
Fix tests
2017-11-10 11:13:52 +00:00
f4428267a1
Refactor onboarding redirect, add groups to the onboarding starters
2017-11-10 10:51:28 +00:00
f7da5836e1
Make blacklistUnverifiedDevices override the level order
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-08 17:41:32 -07:00
58ee4d0a76
rewrite the tinter to be ES6, and correctly cache fixups per theme
2017-11-08 06:55:07 -08:00
e729bc431d
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:52 -08:00
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
36cd22663a
Open group settings when the group is created
2017-11-06 18:02:50 +00:00
781b94c8f4
Appease the linter
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-05 15:37:06 -07:00
10519f9465
Fix the tests
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-05 14:56:41 -07:00
3958e32672
Ensure blacklistUnverifiedDevices persists reloads
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 20:13:23 -07:00
68115f5b9c
tint when theming correctly
2017-11-05 00:40:38 +00:00
e72e30197a
calculate new CSS tinting when we change theme
2017-11-04 23:50:57 +00:00
0d3f0eaf98
Convert local settings to granular settings
...
This breaks language selection.
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-29 16:53:00 -06:00
858c3a2548
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-10-27 18:59:57 +01:00
ac7a94afb2
apply theme tint at launch
2017-10-26 01:43:42 +01:00
2f8f2ce76e
Swap from ui_opacity to panel_disabled
...
to simplify the process of disabling panels in the UI.
2017-10-25 11:23:51 +01:00
37fd19290f
concept of default theme
2017-10-20 18:42:29 +01:00
7492f2dffa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings
2017-10-04 22:35:29 +01:00
6b9a2909df
Add rule to enforce spacing in curly brackets in JSX children
...
This required an updated in version of eslint-plugin-react to 7.4.0.
2017-09-28 11:21:06 +01:00
e9fb5712bd
Merge branch 'develop' into dbkr/group_userlist
2017-09-19 13:26:55 +01:00
1f837d2ae1
Make /join join again
...
The auto_join parameter to view_room got broken at some point so
/join took you to the room and then sat there like a lemon.
Fixes https://github.com/vector-im/riot-web/issues/5029
2017-09-14 23:06:00 +01:00
3c3328c5f1
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-09-13 16:34:39 +01:00
0e8bd856bc
remove obsolete this._roomViewStoreToken.remove();
2017-09-08 20:14:27 +02:00
663dc3e513
Don't re-render matrixchat unnecessarily
...
...on room switch. We were setting most of the state in viewRoom,
but getting the current room ID from the RoomViewStore, but this
meant we did one setState from the RoomViewStore updating,
re-rendered and then setState again in viewRoom causing another
render. This just sets the room ID in viewRoom.
2017-09-08 18:56:57 +01:00
d86fe0df6e
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-29 13:29:55 +01:00
299db845ff
PR feedback
2017-08-25 12:10:13 +01:00
b65e1769d7
Dispatch incoming_call synchronously
...
- this should fix a race where if the 'hangup' arrives hard on the tail of the
Call.incoming, we don't ignore it.
(We still have a problem in that we blip the hangup tone and UI, but that is
arguably a separate problem)
2017-08-24 13:05:17 +01:00
bdb2d6b475
Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings
...
# Conflicts:
# src/components/structures/MatrixChat.js
2017-08-17 13:39:19 +01:00
ca5e26744f
Make dialog more specific and hide options behind advanced spoiler
2017-08-17 13:33:07 +01:00
ddf1017799
Make group invites work
2017-08-16 14:58:30 +01:00
252ab208e4
Merge pull request #1300 from matrix-org/dbkr/userpicker
...
Refactor ChatInviteDialog to be UserPickerDialog
2017-08-16 14:29:07 +01:00
e1ddd3781d
Merge branch 'dbkr/userpicker' into dbkr/group_userlist
2017-08-15 14:10:45 +01:00
1b66e88b6e
ChatInviteDialog -> UserPickerDialog pt 2
...
The other changes I forgot to add
2017-08-14 17:43:00 +01:00
2844b574d5
Re-add useful comment
2017-08-14 14:41:03 +01:00
b59de7964c
Wait for first sync before dispatching view_user on /user
...
the RightPanel will be mounted once we're done doing the first sync, so wait until then and then dispatch a view_user. This is not very nice but it's what we do for view_room.
2017-08-14 14:37:49 +01:00
d9e8292a5e
Revert "At /user, view member of current room"
2017-08-14 14:06:54 +01:00
02217c8bd2
Merge pull request #1290 from matrix-org/luke/fix-user-url-no-middle-panel
...
At /user, view member of current room
2017-08-11 10:49:22 +01:00
89254e77f4
When no member, use null roomId
2017-08-10 15:23:14 +01:00
