Matthew Hodgson
617e1eede3
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
2017-04-14 18:30:21 +01:00
Luke Barnard
7ae13f5889
Merge pull request #762 from lieuwex/hide-link-preview-quote
...
Don't show link preview when link is inside of a quote
2017-04-12 15:31:43 +01:00
Luke Barnard
a29d8c2af2
Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings
...
Escape closes UserSettings
2017-04-12 15:18:19 +01:00
Luke Barnard
9c9dc84f45
Remove redundant setting of readMarkerEventId
2017-04-12 15:12:37 +01:00
Luke Barnard
249e42747b
Fix bug where roomId was expected to be a property on timelineSet
2017-04-12 15:09:56 +01:00
Luke Barnard
1c25ed89b0
Initial implementation of using new RM API
...
As detailed here https://docs.google.com/document/d/1UWqdS-e1sdwkLDUY0wA4gZyIkRp-ekjsLZ8k6g_Zvso/edit , the RM state is no longer kept locally, but rather server-side. The client now uses it's locally-calculated RM to update the server and receives server updates via the per-room account data.
The sending of the RR has been bundled in to reduce traffic when sending both. In effect, whenever a RR is sent the RM is sent with it but using the new API.
This uses a js-sdk change which has set to be finalised and so might change.
2017-04-12 15:05:39 +01:00
Luke Barnard
424aae6b91
Prevent the ghost and real RM tile from both appearing
2017-04-12 15:04:38 +01:00
David Baker
1d836c7d02
Back to js-sdk develop
2017-04-12 10:04:25 +01:00
David Baker
9034443065
Merge branch 'master' into develop
2017-04-12 10:02:50 +01:00
David Baker
1ff4439566
v0.8.7
2017-04-12 10:02:21 +01:00
David Baker
d728925177
Prepare changelog for v0.8.7
2017-04-12 10:02:21 +01:00
David Baker
73888ea616
js-sdk 0.7.6
2017-04-12 10:00:35 +01:00
David Baker
726cb43fee
Merge pull request #794 from matrix-org/luke/feature-textual-pls
...
Implement user power-level changes in timeline
2017-04-12 09:52:53 +01:00
David Baker
25665a81ae
v0.8.7-rc.4
2017-04-11 18:47:45 +01:00
David Baker
e12d079aa5
Prepare changelog for v0.8.7-rc.4
2017-04-11 18:47:45 +01:00
David Baker
a0b338efbe
Merge remote-tracking branch 'origin/develop' into release-v0.8.7
2017-04-11 18:43:32 +01:00
David Baker
b8d5f976fd
Merge pull request #799 from matrix-org/dbkr/fix_vanishing_people_section_clear_cache
...
Fix people section vanishing on 'clear cache'
2017-04-11 18:26:52 +01:00
David Baker
d4dc16545a
Fix people section vanishing on 'clear cache'
...
Stop the client first
Fixes https://github.com/vector-im/riot-web/issues/3610
2017-04-11 18:16:29 +01:00
David Baker
95dfbc5546
Merge pull request #798 from matrix-org/dbkr/clear_cache_button_electron
...
Make the clear cache button work on desktop
2017-04-10 17:56:59 +01:00
David Baker
811cd79206
Make the clear cache button work on desktop
...
Fixes https://github.com/vector-im/riot-web/issues/3597
2017-04-10 17:39:27 +01:00
David Baker
46b362b20c
v0.8.7-rc.3
2017-04-10 16:52:30 +01:00
David Baker
cacb34a37d
Prepare changelog for v0.8.7-rc.3
2017-04-10 16:52:30 +01:00
David Baker
a77fdd0383
js-sdk rc.2
2017-04-10 16:47:45 +01:00
David Baker
966dc3a071
v0.8.7-rc.2
2017-04-10 16:46:14 +01:00
David Baker
4a8173c064
Prepare changelog for v0.8.7-rc.2
2017-04-10 16:46:13 +01:00
David Baker
2e01ab675d
Merge remote-tracking branch 'origin/develop' into release-v0.8.7
2017-04-10 16:45:13 +01:00
David Baker
7578737deb
Merge pull request #797 from matrix-org/matthew/fix-e2e-export-warnings
...
fix the warning shown to users about needing to export e2e keys
2017-04-10 13:35:00 +01:00
Matthew Hodgson
5de71ef504
unbreak in-app permalinks correctly
2017-04-10 12:07:39 +01:00
Matthew Hodgson
2a4b052fa5
unbreak in-app permalinks
2017-04-10 12:06:54 +01:00
Luke Barnard
8b4836b60e
Refactor roles into Roles.js
...
So that the mapping between a numerical power level and a "role" are done in one place. PowerSelector.js has been modified to use the same mapping.
2017-04-10 10:09:26 +01:00
Matthew Hodgson
6dbb4e9002
fix the warning shown to users about needing to export e2e keys
...
apparently when we added the buttons to export e2e keys to the Logout button, we didn't change the text warning the user that e2e export was coming soon. likewise when changing password and forgetting password (where we didn't even have a button to export keys)
2017-04-07 23:34:11 +01:00
David Baker
440307bd39
v0.8.7-rc.1
2017-04-07 17:04:03 +01:00
David Baker
76ec3edb83
Prepare changelog for v0.8.7-rc.1
2017-04-07 17:04:03 +01:00
David Baker
2285239428
js-sdk prerelease
2017-04-07 17:02:47 +01:00
David Baker
88c04344b0
Merge pull request #792 from matrix-org/dbkr/indexeddb_webworker
...
Add support for using indexeddb in a webworker
2017-04-07 16:17:35 +01:00
Richard van der Hoff
6352784a2c
Merge pull request #795 from matrix-org/luke/fix-pagination3
...
Fix infinite pagination/glitches with pagination
2017-04-07 13:24:22 +01:00
Luke Barnard
4342a2ad47
Merge pull request #793 from matrix-org/luke/fix-guest-team-token-home-page
...
Fix issue where teamTokenMap was ignored for guests
2017-04-07 11:53:00 +01:00
Luke Barnard
d218f90cde
Fix infinite pagination/glitches with pagination
...
I think this was being caused by a bug introduced in 47f29b that meant that `backwards` was actually being used as `forwards`.
2017-04-07 11:34:31 +01:00
Luke Barnard
a815788af8
Fix issue where teamTokenMap was ignored for guests
...
This was an issue because guests do not log in with a teamToken, it is implicitly set by MatrixChat when it mounts. The fix is to view_home_page when a login occurs and MatrixChat has this._teamToken set.
2017-04-06 17:10:32 +01:00
Luke Barnard
6010350ce5
Implement power-level changes in timeline
...
Fixes https://github.com/vector-im/riot-web/issues/266
2017-04-06 17:02:35 +01:00
Luke Barnard
73bdfe8f74
Merge pull request #791 from matrix-org/luke/feature-clickable-emotes
...
Click emote sender -> insert display name into composer
2017-04-06 15:56:37 +01:00
Luke Barnard
6c09a08a7d
Click emote sender -> insert display name into composer
...
Also, fix the imports TextualBody.
2017-04-06 14:08:59 +01:00
Luke Barnard
880a48494b
Merge pull request #785 from matrix-org/luke/fix-scroll-past-big-event
...
Fix scroll token selection logic
2017-04-06 12:36:30 +01:00
Luke Barnard
755ea969c1
Merge pull request #790 from matrix-org/luke/feature-last-viewed-room
...
Replace sdkReady with firstSyncPromise, add mx_last_room_id
2017-04-06 12:28:25 +01:00
Luke Barnard
5f8a7b46a8
Remove redundant setState call, always focus composer after sync
2017-04-06 11:44:25 +01:00
Luke Barnard
95b40a976c
Replace sdkReady with firstSyncPromise, add mx_last_room_id
...
- Create a promise that will serve as a lock to be blocked on by things that need to wait for the first sync before accessing state.
- Use this promise to block `view_room` calls until a sync has occured instead of just dropping them silently if the sync hasn't happened yet.
- Store the current room ID in a localStorage item `mx_last_room_id` when `view_room` fires. This persists the last viewed room ID so that it can be restored on refresh, browser quit. This replaces the previous logic which set the room following a sync based on the most recent unread room.
2017-04-06 11:38:06 +01:00
David Baker
b78f654476
Add support for using indexeddb in a webworker
2017-04-06 11:13:39 +01:00
Luke Barnard
b0a04e6f00
Clarify comment
2017-04-05 17:52:05 +01:00
Luke Barnard
423babdb17
Remove fairly redundant condition
...
Making sure that a node is intersected by the bottom of the wrapper is a bit overkill, given that we iterate from the bottom. This also prevents the scenario of having no nodes that are not precisely intersected, but possibly straddling the bottom of the wrapper.
2017-04-05 17:51:07 +01:00
Luke Barnard
47f29b9454
Simplify simulated unfill
2017-04-05 17:48:24 +01:00
