Commit Graph

3309 Commits

Author SHA1 Message Date
daniel tygel
d3331f293b Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-04-16 23:27:38 -03:00
Matthew Hodgson
c6ee221ae4 typos 2017-04-16 15:58:00 +01:00
Matthew Hodgson
8351ec9738 thread RoomTile focus events through RoomSubList up to RoomList 2017-04-15 13:23:11 +01:00
Matthew Hodgson
27de972bfb oops 2017-04-15 12:02:50 +01:00
Matthew Hodgson
e5e259e1f8 put a ! on invite sublists 2017-04-15 12:02:16 +01:00
Matthew Hodgson
a74bbb424c cmd-k shortcut to the searchbox 2017-04-15 11:37:09 +01:00
Matthew Hodgson
15accf33f5 get rid of the evil blue outlines 2017-04-15 00:30:31 +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
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 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
6a5d0dda2f Use release versions of js-sdk & react-sdk 2017-04-12 10:03:43 +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 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
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
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
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
0b266d2e83 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
a1cb566761 Bump electron version 2017-04-10 16:01:21 +01:00
Luke Barnard
01a96d92f4 Merge pull request #3596 from vector-im/luke/fix-redacted-bg
Redacted events bg: black lozenge -> torn paper
2017-04-10 15:59:41 +01:00
Luke Barnard
0b1745bceb Redacted events bg: black lozenge -> torn paper 2017-04-10 15:49:40 +01:00
David Baker
7d203f40cd Merge pull request #3594 from vector-im/rav/send_app_to_rageshake
Add 'app' parameter to rageshake report
2017-04-10 15:25:55 +01:00
Richard van der Hoff
b8b74402c1 Add 'app' parameter to rageshake report 2017-04-10 15:07:43 +01:00
David Baker
08ee93a57b v0.9.8-rc.1 2017-04-07 17:29:12 +01:00
David Baker
bced608c48 Roll back version number to try again 2017-04-07 17:28:32 +01:00
David Baker
c576e07c85 v0.9.8-rc.1 2017-04-07 17:19:08 +01:00
David Baker
cc87135b28 Prepare changelog for v0.9.8-rc.1 2017-04-07 17:19:08 +01:00
David Baker
a63eb2621b Prerelease js-sdk & react-sdk 2017-04-07 17:12:48 +01:00
David Baker
42e317dab8 Merge pull request #3578 from vector-im/dbkr/indexeddb_webworker
Add support for indexeddb sync in webworker
2017-04-07 16:17:39 +01:00
David Baker
ec870039bf Don't use endsWith as it'll break on old node
It's a lodash template though, so use lodash
2017-04-07 14:57:02 +01:00
David Baker
b65466bc4f Use dedicated indexeddb worker import 2017-04-07 14:41:41 +01:00
David Baker
515b57ba12 Update for rename of worker 2017-04-07 11:23:14 +01:00
Luke Barnard
4d4da0d7ca Merge pull request #3574 from vector-im/luke/feature-clickable-emotes
Add CSS to make Emote sender cursor : pointer
2017-04-06 15:56:45 +01:00
Luke Barnard
778e7dcab0 Add CSS to make Emote sender cursor : pointer 2017-04-06 14:11:37 +01:00
David Baker
fd5e94dfad Merge pull request #3565 from vector-im/rav/remove_rageshake
Remove rageshake server
2017-04-06 12:21:33 +01:00
David Baker
f187a359e6 Add support for indexeddb sync in webworker 2017-04-06 11:15:14 +01:00
Luke Barnard
579e70e967 Merge pull request #3566 from vector-im/luke/clarify-unread-msg-top-banner
Adjust CSS for matrix-org/matrix-react-sdk#789
2017-04-04 16:45:38 +01:00