67089cb527
If new RR-RM API not implemented, fallback to RR-only API
2017-04-20 14:34:59 +01:00
a4ba5f041c
Remove log, reinstate comment
2017-04-19 10:46:08 +01:00
edeaef8c2f
Initialise last_rm_sent_event_id
2017-04-19 10:28:38 +01:00
81bf2be13b
Make note of inconsistant roomReadMarkerTsMap
...
This will become redundant when there is server support for directionality of the RM
2017-04-19 10:27:43 +01:00
a787ee8480
Remove spammy log
2017-04-19 10:20:53 +01:00
00cf5b5918
Revert change
2017-04-19 10:20:24 +01:00
e32f153573
Remove Room.accountData listener on unmount
2017-04-19 10:18:25 +01:00
28818b857a
Remove log
2017-04-19 10:17:44 +01:00
81bdfe2126
Update to match renamed API
2017-04-19 10:14:57 +01:00
c431c9ab22
Clarify comment
2017-04-18 15:18:21 +01:00
d38520dfb4
Undo change in ghost RM logic
...
Put a XXX to indicate that the ghost tile should be replaced with something mor e stable. As it stands, the ghost will appear, potentially at a different position to the RMs actual position
2017-04-18 15:17:42 +01:00
d33afa99ab
marker -> event_id
2017-04-18 15:13:05 +01:00
4b5364e9ae
Merge branch 'develop' into luke/feature-read-marker
2017-04-18 14:45:18 +01:00
28ed69b617
m.read_marker -> m.fully_read
2017-04-18 14:44:43 +01:00
1189368aab
add a class to remove evil blue outlines
2017-04-15 00:30:48 +01:00
617e1eede3
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
2017-04-14 18:30:21 +01:00
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
a29d8c2af2
Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings
...
Escape closes UserSettings
2017-04-12 15:18:19 +01:00
9c9dc84f45
Remove redundant setting of readMarkerEventId
2017-04-12 15:12:37 +01:00
249e42747b
Fix bug where `roomId` was expected to be a property on timelineSet
2017-04-12 15:09:56 +01:00
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
424aae6b91
Prevent the ghost and real RM tile from both appearing
2017-04-12 15:04:38 +01:00
1d836c7d02
Back to js-sdk develop
2017-04-12 10:04:25 +01:00
9034443065
Merge branch 'master' into develop
2017-04-12 10:02:50 +01:00
1ff4439566
v0.8.7
2017-04-12 10:02:21 +01:00
d728925177
Prepare changelog for v0.8.7
2017-04-12 10:02:21 +01:00
73888ea616
js-sdk 0.7.6
2017-04-12 10:00:35 +01:00
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
25665a81ae
v0.8.7-rc.4
2017-04-11 18:47:45 +01:00
e12d079aa5
Prepare changelog for v0.8.7-rc.4
2017-04-11 18:47:45 +01:00
a0b338efbe
Merge remote-tracking branch 'origin/develop' into release-v0.8.7
2017-04-11 18:43:32 +01:00
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
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
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
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
46b362b20c
v0.8.7-rc.3
2017-04-10 16:52:30 +01:00
cacb34a37d
Prepare changelog for v0.8.7-rc.3
2017-04-10 16:52:30 +01:00
a77fdd0383
js-sdk rc.2
2017-04-10 16:47:45 +01:00
966dc3a071
v0.8.7-rc.2
2017-04-10 16:46:14 +01:00
4a8173c064
Prepare changelog for v0.8.7-rc.2
2017-04-10 16:46:13 +01:00
2e01ab675d
Merge remote-tracking branch 'origin/develop' into release-v0.8.7
2017-04-10 16:45:13 +01:00
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
5de71ef504
unbreak in-app permalinks correctly
2017-04-10 12:07:39 +01:00
2a4b052fa5
unbreak in-app permalinks
2017-04-10 12:06:54 +01:00
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
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
440307bd39
v0.8.7-rc.1
2017-04-07 17:04:03 +01:00
76ec3edb83
Prepare changelog for v0.8.7-rc.1
2017-04-07 17:04:03 +01:00
2285239428
js-sdk prerelease
2017-04-07 17:02:47 +01:00
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
Luke Barnard