Matthew Hodgson
1189368aab
add a class to remove evil blue outlines
2017-04-15 00:30:48 +01:00
Matthew Hodgson
15accf33f5
get rid of the evil blue outlines
2017-04-15 00:30:31 +01:00
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
ec2a5cce74
Merge branch 'develop' into matthew/whitelist-uri-schemes
2017-04-13 14:08:19 +01:00
Michael Telatynski
3fb54029d7
Fix packaged functionality
...
Improve dependency management for Electron main process deps
Dependencies in /electron/package.json will be installed through a script in /package.json and will be bundled via electron-builder
Does not affect standard webapp whatsoever
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-04-13 13:39:15 +01:00
Michael Telatynski
76008e8abd
Remember and Recall window layout so that position+size persist
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-04-12 18:13:25 +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
Richard van der Hoff
3f291aae5b
Use an opts arg for submit-rageshake
2017-04-12 11:26:53 +01:00
David Baker
76f140c62c
Back to develop js & react sdks
2017-04-12 10:14:58 +01:00
David Baker
a12d7a2b66
Merge branch 'release-v0.9.8'
2017-04-12 10:14:00 +01:00
David Baker
ba8745cb42
v0.9.8
v0.9.8
2017-04-12 10:10:53 +01:00
David Baker
967ebb5f9f
Prepare changelog for v0.9.8
2017-04-12 10:10:52 +01:00
David Baker
1d836c7d02
Back to js-sdk develop
2017-04-12 10:04:25 +01:00
David Baker
6a5d0dda2f
Use release versions of js-sdk & react-sdk
2017-04-12 10:03:43 +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
Richard van der Hoff
6423f7ce03
rageshake: factor out submission to a separate file
...
This will mean we can load it asyncronously in future, if we want.
2017-04-11 18:59:22 +01:00
David Baker
4ead2f338d
v0.9.8-rc.3
v0.9.8-rc.3
2017-04-11 18:50:21 +01:00
David Baker
55ec7dcebc
Prepare changelog for v0.9.8-rc.3
2017-04-11 18:50:20 +01:00
David Baker
8587df1dd9
React SDK rc.4
2017-04-11 18:49:27 +01:00
David Baker
d5b1db064f
Merge remote-tracking branch 'origin/develop' into release-v0.9.8
2017-04-11 18:48:55 +01:00
Richard van der Hoff
4efb2b6750
Rageshake: Factor out getLogsForReport
...
... in preparation for factoring out sending the report
2017-04-11 18:47:55 +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
Richard van der Hoff
cbfa4dd1ab
Get rageshake endpoint from SdkConfig instead of storing in rageshake
...
- in preparation for factoring out the sending of the rageshake
2017-04-11 18:46:48 +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
Matthew Hodgson
b26c460f13
shrink the redacted tear
2017-04-10 23:22:25 +01:00
daniel tygel
dd9150cef1
Merge branch 'add_config_json_to_gitignore' into develop
2017-04-10 14:12:38 -03:00
daniel tygel
ab1b377a1d
add config.json to .gitignore
2017-04-10 14:11:26 -03: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
3fa8460ed7
Merge pull request #3598 from vector-im/dbkr/clear_cache_button_electron
...
Make the clear cache button work on desktop
2017-04-10 17:56:49 +01:00
David Baker
7f6d9a625d
Make the clear cache button work on desktop
...
Implement reload in Platforms to support
https://github.com/matrix-org/matrix-react-sdk/pull/798
Fixes https://github.com/vector-im/riot-web/issues/3597
2017-04-10 17:40:09 +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
0b266d2e83
v0.9.8-rc.2
v0.9.8-rc.2
2017-04-10 16:56:41 +01:00
David Baker
7907d41ea8
Prepare changelog for v0.9.8-rc.2
2017-04-10 16:56:40 +01:00
David Baker
32c6482dcf
Bump js-sdk & react-sdk versions
2017-04-10 16:55:27 +01:00
David Baker
ea0c41a9f8
Merge remote-tracking branch 'origin/develop' into release-v0.9.8
2017-04-10 16:55:02 +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