f676b58c00
Add google ardboard logo
2017-06-19 11:47:03 +01:00
9d89bfe264
Fix jitsi logo references
2017-06-19 11:36:15 +01:00
880e7149f3
ModularWidgets: Add a quick VR demo widget
2017-06-14 13:05:43 +02:00
d67e7289e8
Merge branch 'develop' into rob/apps
2017-06-13 15:50:43 +02:00
03ba3bd431
Merge branch 'rxl881/apps' into rob/apps
2017-06-13 15:41:52 +02:00
91eabbba60
MessageComposer: Trigger Jitsi app from call buttons
2017-06-13 15:35:13 +02:00
e2759774fc
RoomView: Correctly pass userId from matrix client
...
It isn't set in the state anywhere.
2017-06-13 15:19:38 +02:00
99b1de7f0e
RoomView: Display AppsDrawer if apps in room state
2017-06-13 15:19:06 +02:00
392cd7861d
Merge pull request #1084 from matrix-org/rav/remove_roomstore_listener
...
remove RoomViewStore listener from MatrixChat on unmount
2017-06-13 13:10:49 +01:00
1ea9ed5d8c
remove RoomViewStore listener from MatrixChat on unmount
...
... to avoid spurious warnings from the tests.
2017-06-13 12:39:26 +01:00
876899948f
Merge in upstream changes
2017-06-13 11:44:23 +01:00
2da30137ec
Fix import path and add LG widget
2017-06-13 10:31:16 +01:00
c1d1a1377c
allow forcing of TURN, pass account val per-call until UX is designed.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-12 20:20:27 +01:00
f9f924bbd6
Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps
2017-06-12 14:50:25 +01:00
cc74a09abd
Remove start_upgrade_registration dispatch handler
...
This dispatch is no longer raised anywhere, so we may as well get rid of the
code that it executes, as well as the state which is only set there.
2017-06-12 08:38:29 +01:00
9e96e8e87f
Remove guest-only bits of UserSettings
...
There is now no way to open UserSettings as a guest, so we might as well lose
the dead code.
2017-06-12 08:36:41 +01:00
56efe7d2f2
Merge pull request #1064 from matrix-org/rav/delinting
...
Delinting
2017-06-12 08:34:58 +01:00
ecc8abbfc9
When ChatCreateOrReuseDialog is cancelled by a guest, go home
2017-06-09 13:46:45 +01:00
9e0b476b72
Merge branch 'develop' into rob/apps
2017-06-09 12:06:44 +02:00
924c08b143
Merge pull request #1067 from matrix-org/luke/fix-forgetting-last-room
...
Goto /home when forgetting the last room
2017-06-09 11:03:14 +01:00
19bb879fbf
Handle only 1 room in the list
2017-06-09 10:54:42 +01:00
c7229967a6
Goto /home when forgetting the last room
2017-06-09 10:28:45 +01:00
a21b6e61a6
Default to home page when settings is closed
...
If the current room isn't set.
2017-06-09 10:08:26 +01:00
105c6b2b87
delint MatrixChat
...
once more. with feeling.
2017-06-09 03:09:03 +01:00
20bdae6079
delint UserSettings.js
2017-06-09 03:08:57 +01:00
ce0977373e
Merge pull request #1058 from matrix-org/luke/fix-event-id-state
...
Control currently viewed event via RoomViewStore
2017-06-08 18:10:29 +01:00
5588e115eb
Clarify doc for highlighted
2017-06-08 17:57:37 +01:00
9892566007
Highlighted means highlighted
2017-06-08 17:54:41 +01:00
c02dbd1cdc
Rename initial state variables
2017-06-08 17:26:08 +01:00
5e55b6a643
PR feedback
2017-06-08 16:23:43 +01:00
9def0bb5c2
Oops, fix email check
2017-06-08 16:08:19 +01:00
8dc20606c8
Use comma for list of three things
2017-06-08 16:07:29 +01:00
000a045e35
Rename RVS state (event -> initialEvent) and redocument
2017-06-08 15:52:21 +01:00
d691c891e7
Move all login error string generation into view
...
This makes all the various hits done by login report the same
useful error messages and gets rid of the broken ones like printing
the http status code even if it was undefined. Also add text for
the case of overzealous browser extensions because lots of people
get bitten by it.
2017-06-08 15:49:48 +01:00
1792fa45f4
Null-guard roomId before sending a dispatch to update scroll state
...
Otherwise we pointlessly assign the null key to something
2017-06-08 15:45:50 +01:00
59e649f326
Add comment about roomId potentially not being resolved following an update from RoomViewStore
2017-06-08 15:43:45 +01:00
e58e4db628
Explain why search results are cleared when eventId changes
2017-06-08 15:38:58 +01:00
dca2be6325
Add RoomView initial state and docs
2017-06-08 15:37:30 +01:00
2e82bf40fb
Explain setting of highlighted in room/$eventId showScreen handling.
2017-06-08 15:34:20 +01:00
8ddc38c9b1
Doc _viewRoom highlighted
2017-06-08 15:32:31 +01:00
aa20ad706e
Remove redundant currentRoomAlias
2017-06-08 15:30:43 +01:00
ea97d16aa2
Merge branch 'develop' into luke/fix-event-id-state
...
Conflicts:
src/components/structures/MatrixChat.js
2017-06-08 14:33:58 +01:00
f320f7d475
Remove redundant action id
2017-06-08 14:30:45 +01:00
d3cf78ff5a
Control currently viewied event via RoomViewStore
...
Fix for https://github.com/vector-im/riot-web/issues/4224
Due to the way `MatrixChat` does a state update when the `view_room` dispatch fires and a second update when `RoomViewStore` sends an update, the current event ID and room ID were becoming out of sync. The solution devised was to have the event ID managed by the `RoomViewStore` itself and do any defaulting there (for when we revisit a room that we saved scroll state for previously).
This required a few changes:
- The addition of `update_scroll_state` in `RoomViewStore` allows the `RoomView` to save scroll state for a room before swapping to another one. Previously the caching of scroll state was done in `RoomView`.
- The `view_room` dispatch now accepts an `event_id`, which dictates which event is supposed to be scrolled to in the `MessagePanel` when a new room is viewed. It also accepts `event_offset`, but currently, this isn't passed in by a dispatch in the app, but it is clobbered when loading the default position when an `event_id` isn't specified. Finally, `highlighted` was added to distinguish whether the initial event being scrolled to is also highlighted. This flag is also used by `viewRoom` in `MatrixChat` in order to decide whether to `notifyNewScreen` with the specified `event_id`.
2017-06-08 14:17:49 +01:00
6d1fa775a0
Formatting
2017-06-08 14:14:45 +01:00
566fb2caeb
Add some logging around switching rooms
...
... which I wish had been there when I was staring at a rageshake.
2017-06-07 22:41:02 +01:00
ef2fedc3a9
fix missing translations and typos in i18n
2017-06-07 18:24:35 +01:00
a09001933a
git status
2017-06-07 15:39:27 +01:00
53ea41e8a5
Merge branch 'develop' into new-guest-access
2017-06-07 12:08:37 +01:00
1dbdbc163b
Cancel 'join room' action if 'log in' is clicked
...
or 'choose different server'
We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.
Fixes https://github.com/vector-im/riot-web/issues/4217
2017-06-07 11:55:24 +01:00
Richard Lewis