eef4f7c4cf
Merge pull request #7637 from vector-im/travis/cleanup-request
...
Remove the request-only stuff we don't need anymore
2018-11-02 09:39:15 -06:00
36cc5de0e7
Remove the request-only stuff we don't need anymore
...
This was introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2250 but can be pulled out due to https://github.com/matrix-org/matrix-js-sdk/pull/770 . See https://github.com/vector-im/riot-web/issues/7634 for more information about the future.
2018-10-31 13:05:36 -06:00
ade0f34c6f
Merge branch 'develop' into experimental
2018-10-31 14:36:43 +01:00
854798f470
Merge remote-tracking branch 'origin/develop' into develop
2018-10-29 14:31:01 +00:00
ca305399c3
npm update
2018-10-29 14:30:35 +00:00
00a8d44ce1
Merge remote-tracking branch 'origin/develop' into develop
2018-10-29 14:28:30 +00:00
79c7f331c9
develop js & react sdk deps
2018-10-29 14:28:13 +00:00
409c48efcb
Merge branch 'master' into develop
2018-10-29 14:27:46 +00:00
29f3ff155a
v0.17.3
2018-10-29 14:22:55 +00:00
6c1deb41be
Prepare changelog for v0.17.3
2018-10-29 14:22:55 +00:00
4574415e97
v0.17.3
2018-10-29 14:20:59 +00:00
f05646c5a1
released js-sdk & react-sdk
2018-10-29 14:20:12 +00:00
a6f8f707f3
Merge remote-tracking branch 'origin/develop' into develop
2018-10-29 05:23:04 +00:00
e19dbe4f3b
Translated using Weblate (Telugu)
...
Currently translated at 27.0% (10 of 37 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2018-10-29 05:23:04 +00:00
d393cd67f7
Merge pull request #7615 from vector-im/t3chguy/fix_author_of_electron_app
...
Correct the author of the electron app
2018-10-28 23:22:58 -06:00
c80f5ddcd1
Correct the author of the electron app
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-10-27 11:04:05 +01:00
a02009d31f
Update package-lock.json
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:21:40 -05:00
a4ed1afeb5
Update babel-eslint to 8.1.1
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:07:35 -05:00
1fea7c022e
Fix order of operations for npm install on Travis CI
2018-10-26 20:44:14 -06:00
e7f5aee9fb
Regenerate package-lock.json (again)
2018-10-26 20:43:53 -06:00
d3805f7545
Regenerate package-lock.json and upgrade eslint again
2018-10-26 20:12:43 -06:00
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
18daa186b0
Merge branch 'develop' into experimental
2018-10-26 15:33:57 +02: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
03dcc97ce9
add new variables to status
2018-10-24 13:56:42 +02:00
e2b55315a6
v0.17.3-rc.1
2018-10-24 11:31:59 +01:00
1f8b0f2135
Prepare changelog for v0.17.3-rc.1
2018-10-24 11:31:59 +01:00
a9a45dc32b
v0.17.3-rc.1
2018-10-24 11:30:44 +01:00
f7138c0516
react-sdk & js-sdk rc.1
2018-10-24 11:27:01 +01: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
a478f02c5b
Merge pull request #7541 from vector-im/bwindels/initialtimelinetweaks
...
Redesign: apply changes from dharma theme to status theme
2018-10-23 19:36:04 +00:00
ffc0d3cda0
Merge pull request #7540 from vector-im/bwindels/alwaysshowdharma
...
Redesign: ignore setting and always show dharma theme for now
2018-10-23 19:35:53 +00:00
c68770c0aa
ignore setting and always show dharma theme for now
2018-10-23 15:51:06 +02:00
ab1f68df93
apply changes from dharma theme to status theme
2018-10-23 15:50:09 +02: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
Travis Ralston