Commit graph

6687 commits

Author SHA1 Message Date
Bruno Windels
df155293b1
Merge pull request #7834 from vector-im/rav/no_preserve_hs_url
Update the tests to match https://github.com/matrix-org/matrix-react-sdk/pull/2340
2018-12-11 16:41:31 +00:00
Richard van der Hoff
6ca0b3ad03 Update the tests to match https://github.com/matrix-org/matrix-react-sdk/pull/2340
See the react-sdk PR for some context.
2018-12-11 16:14:17 +00:00
David Baker
c2038a5ccc v0.17.8 2018-12-10 13:48:11 +00:00
David Baker
cb628d0799 Prepare changelog for v0.17.8 2018-12-10 13:48:11 +00:00
David Baker
7c4f67b1a1 v0.17.8 2018-12-10 13:46:57 +00:00
David Baker
a82f9d5266 Released js-sdk & react-sdk 2018-12-10 13:46:35 +00:00
David Baker
b6493a2f82 v0.17.8-rc.1 2018-12-06 12:49:53 +00:00
David Baker
74c81d6921 v0.17.8-rc.1 2018-12-06 12:48:34 +00:00
David Baker
02eb8a284c Actually revert electron app version bump
last one was in fasct the main version file
2018-12-06 12:47:18 +00:00
David Baker
bf2d792d94 Revert electron app version bump 2018-12-06 12:45:38 +00:00
David Baker
10294ab240 react-sdk rc.2 2018-12-06 12:42:52 +00:00
David Baker
88ff92a658 v0.17.8-rc.1 2018-12-06 11:21:42 +00:00
David Baker
8d9987a6b5 Prepare changelog for v0.17.8-rc.1 2018-12-06 11:21:42 +00:00
David Baker
6ba471421f v0.17.8-rc.1 2018-12-06 11:20:33 +00:00
David Baker
5310b4c14b js-sdk & react-sdk rc.1 2018-12-06 11:20:00 +00:00
David Baker
69567f9806
Merge pull request #7784 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-12-05 16:00:19 +00:00
Weblate
0007e669fb Merge remote-tracking branch 'origin/develop' into develop 2018-12-05 15:55:37 +00:00
David Baker
7247e97ff0 Update to electron 3.0.10 2018-12-05 15:55:20 +00:00
Weblate
844dbcf740 Merge remote-tracking branch 'origin/develop' into develop 2018-11-29 21:56:33 +00:00
Travis Ralston
10671aa06e
Merge pull request #7755 from vector-im/travis/rageshake-console
Add a function to send a rageshake from the console
2018-11-29 14:56:27 -07:00
Travis Ralston
373f850002 Safely bind console.log and default withLogs to true 2018-11-29 13:13:46 -07:00
Travis Ralston
ac34ca11df Appease the linter 2018-11-27 16:11:58 -07:00
Travis Ralston
710e295b44 Add a function to send a rageshake from the console
This is mostly useful for cases when the UI is broken or the user can't access the button because they aren't logged in. This is particularly helpful for troubleshooting issues with .well-known discovery if/when they come up.

Ref: https://github.com/vector-im/riot-web/issues/4802
2018-11-27 16:03:37 -07:00
Weblate
c3b05cb34e Merge remote-tracking branch 'origin/develop' into develop 2018-11-23 07:53:16 +00:00
David Baker
b5c27ca074
Merge pull request #7738 from vector-im/revert-7737-revert-7490-lint
Re-apply "Run lint on travis builds and use modern node versions"
2018-11-23 07:53:11 +00:00
David Baker
704a599811 Put back modernizr import
In a way that hopefully makes the linter happy and makes it implicit
that it's side-effecting a global.
2018-11-22 18:27:53 +00:00
David Baker
1dfaf70562
Revert "Revert "Run lint on travis builds and use modern node versions"" 2018-11-22 18:25:55 +00:00
Weblate
dc92b126c7 Merge remote-tracking branch 'origin/develop' into develop 2018-11-22 18:18:06 +00:00
David Baker
c6f70cb72c
Merge pull request #7737 from vector-im/revert-7490-lint
Revert "Run lint on travis builds and use modern node versions"
2018-11-22 18:18:01 +00:00
David Baker
f701e2601a
Revert "Run lint on travis builds and use modern node versions" 2018-11-22 18:17:09 +00:00
Weblate
8cb8890ab3 Merge remote-tracking branch 'origin/develop' into develop 2018-11-22 18:01:09 +00:00
David Baker
a7a5679bfa
Merge pull request #7490 from aaronraimist/lint
Run lint on travis builds and use modern node versions
2018-11-22 18:01:04 +00:00
David Baker
03587abff1
Update .travis.yml
Remove node 6
2018-11-22 17:54:02 +00:00
Weblate
496a5baffd Merge remote-tracking branch 'origin/develop' into develop 2018-11-22 17:06:38 +00:00
David Baker
8996b6b429 Merge branch 'master' into develop 2018-11-22 17:06:25 +00:00
David Baker
d483fb0605 v0.17.7 2018-11-22 16:58:48 +00:00
David Baker
c2ec5f39ab Prepare changelog for v0.17.7 2018-11-22 16:58:48 +00:00
David Baker
58f927538f v0.17.7 2018-11-22 16:56:41 +00:00
David Baker
d9434c7af5 Bump js-sdk & react-sdk 2018-11-22 16:56:13 +00:00
David Baker
6f54ff9e7f Fix missing js-sdk logging
Some of the js-sdk logging was going missing due to js-sdk's
loglevel library being initialised before the rageshake logging.

Fix by doing the rageshake setup within an import, as commented.
2018-11-22 16:43:15 +00:00
Weblate
9eaba3d3f5 Merge remote-tracking branch 'origin/develop' into develop 2018-11-22 16:32:45 +00:00
David Baker
4805858ecb
Merge pull request #7736 from vector-im/dbkr/fix_missing_logging
Fix missing js-sdk logging
2018-11-22 16:32:39 +00:00
David Baker
092ae7ef2f Fix missing js-sdk logging
Some of the js-sdk logging was going missing due to js-sdk's
loglevel library being initialised before the rageshake logging.

Fix by doing the rageshake setup within an import, as commented.
2018-11-22 16:21:55 +00:00
David Baker
bbb128b672
Merge branch 'develop' into lint 2018-11-22 11:23:02 +00:00
Weblate
15b8d410c0 Merge remote-tracking branch 'origin/develop' into develop 2018-11-21 19:25:36 +00:00
David Baker
8298e73205 Argh, npm, why are you so awful? 2018-11-21 19:25:11 +00:00
Weblate
819e6d9219 Merge remote-tracking branch 'origin/develop' into develop 2018-11-21 19:14:09 +00:00
David Baker
d2c87a0331 Fix jenkins build 2018-11-21 19:13:42 +00:00
Weblate
286c5e8895 Merge remote-tracking branch 'origin/develop' into develop 2018-11-21 19:00:29 +00:00
David Baker
7df77d7e5d Recent node please 2018-11-21 19:00:11 +00:00