70891f41a5
Merge branch 'develop' into lint
2018-10-26 19:56:33 -06:00
cebba5bfa3
Merge pull request #7552 from vector-im/travis/permalink-routing
...
Mock fs, tls, and net to support request in the browser
2018-10-26 14:22:38 -06:00
0f5c62d3cc
Regenerate package-lock.json
...
due to conflicts
2018-10-26 10:06:27 -06:00
f9fa338960
Merge branch 'develop' into travis/permalink-routing
2018-10-26 09:22:13 -06:00
ad7ac26ff3
Upgrade babel-eslint and regenerate package-lock.json
2018-10-25 16:10:27 -06:00
10efaaa078
Merge branch 'develop' into lint
2018-10-25 16:06:02 -06:00
bb353b940e
Merge pull request #7598 from jryans/update-chokidar
...
Update chokidar to transitively get newer fsevents
2018-10-25 15:53:23 -06:00
9732d10f24
Update chokidar to transitively get newer fsevents
...
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-10-25 23:04:25 +02:00
9b80aa76ce
Merge pull request #7385 from vector-im/dbkr/wasm
...
Support WebAssembly version of Olm
2018-10-25 15:58:24 +01:00
bc935012da
Update to Olm 3
2018-10-25 15:44:22 +01:00
e4025f1aff
Mock fs, tls, and net to support request in the browser
...
fs is mocked using memfs, which needs to be installed at all 3 layers because webpack is silly
2018-10-24 16:59:14 -06:00
d080a204a3
electron 3.0.5
2018-10-24 11:12:51 +01:00
fd31d58128
Merge pull request #7549 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2018-10-24 10:26:13 +01:00
b7622d8551
Use babel-eslint 7.2.3 instead
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-19 23:00:02 -05:00
c470e2dcfb
Actually I'll just fix the errors myself and get rid of lintwithexclusions
...
I seemingly need babel-eslint version 8 for VectorHomePage.js but might as well just upgrade to version 10
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-19 21:04:55 -05:00
fe11ae73db
Run lintwithexclusions on travis builds
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-19 20:59:07 -05:00
70fe4f67ee
eslint --fix on test/
2018-10-19 20:59:07 -05:00
6abd1de8b8
eslint --fix on src/
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-19 20:59:06 -05:00
16b150039a
Merge remote-tracking branch 'origin/develop' into develop
2018-10-19 15:07:56 +00:00
ca1dec8e13
Merge branch 'master' into develop
2018-10-19 17:07:29 +02:00
f81d3bc903
Merge branch 'release-v0.17.2'
2018-10-19 17:00:44 +02:00
88132067ad
update version in package lock file
2018-10-19 17:00:13 +02:00
f5eff7d349
v0.17.2
2018-10-19 16:54:27 +02:00
5f35b9903d
Prepare changelog for v0.17.2
2018-10-19 16:54:26 +02:00
221f75542a
v0.17.2
2018-10-19 16:51:26 +02:00
d0fcf3c952
Don't set tags on notifications
...
They are to suppress notifications that don't want to be shown in
addition to each other. This makes no sense for our notifications:
they're each for independent messages. Also settings tags on
notifications makes electron crash on windows when you close the
notif, as per https://github.com/vector-im/riot-web/issues/7512
2018-10-19 16:47:16 +02:00
62f664c592
update matrix-react-sdk to 0.14.1
2018-10-19 16:45:39 +02:00
deaeb1a715
Merge remote-tracking branch 'origin/develop' into develop
2018-10-18 18:26:13 +00:00
c1dfbd6993
Merge pull request #7518 from vector-im/dbkr/better_fix_for_windows_crashes
...
Don't set tags on notifications
2018-10-18 19:26:08 +01:00
2854c0969b
Don't set tags on notifications
...
They are to suppress notifications that don't want to be shown in
addition to each other. This makes no sense for our notifications:
they're each for independent messages. Also settings tags on
notifications makes electron crash on windows when you close the
notif, as per https://github.com/vector-im/riot-web/issues/7512
2018-10-18 19:07:59 +01:00
1de5e61888
Merge remote-tracking branch 'origin/develop' into develop
2018-10-18 17:44:16 +00:00
47493fa7d9
Merge branch 'master' into develop
2018-10-18 18:43:58 +01:00
ecfafc613f
Merge branch 'release-v0.17.0'
2018-10-18 18:43:29 +01:00
a7ea51fc3e
v0.17.1
2018-10-18 18:39:58 +01:00
35147c6514
Prepare changelog for v0.17.1
2018-10-18 18:39:58 +01:00
2518976326
v0.17.1
2018-10-18 18:38:54 +01:00
40cb46de46
Merge pull request #7517 from vector-im/dbkr/stop_electron_crashing
...
Stop electron crashing
2018-10-18 18:35:38 +01:00
bb907d49c9
Typo
2018-10-18 18:35:01 +01:00
231ca253f2
Stop electron crashing
...
Workaround temporarily by not closing notifs on win32 as per
comment.
Fixes https://github.com/vector-im/riot-web/issues/7512
2018-10-18 18:31:06 +01:00
2a80d33a89
Merge remote-tracking branch 'origin/develop' into develop
2018-10-16 10:12:26 +00:00
2202ff1ccd
update deps
2018-10-16 11:12:13 +01:00
a138a9c6ec
Merge remote-tracking branch 'origin/develop' into develop
2018-10-16 10:10:09 +00:00
3d8d66547f
Merge branch 'master' into develop
2018-10-16 11:09:55 +01:00
17e84bf815
Merge branch 'release-v0.17.0'
2018-10-16 11:09:33 +01:00
41540842eb
v0.17.0
2018-10-16 11:00:39 +01:00
65cc3000ee
Prepare changelog for v0.17.0
2018-10-16 11:00:39 +01:00
1fc8592ef6
v0.17.0
2018-10-16 10:59:18 +01:00
4afb5caa4e
Released js-sdk & react-sdk
2018-10-16 10:58:29 +01:00
9830ab3aad
Merge pull request #7503 from vector-im/dbkr/ll_phased_rollout
...
Phased rollout of lazyloading
2018-10-16 11:44:49 +02:00
005e4aa1bd
Phased rollout of lazyloading
2018-10-16 10:43:15 +01:00
Travis Ralston