Commit Graph

6473 Commits

Author SHA1 Message Date
Bruno Windels eed9c56c51 Merge branch 'develop' into matthew/dharma 2018-10-11 09:56:07 +02:00
Matthew Hodgson 5c184e501d dep on dev sdks 2018-10-10 17:35:06 +01:00
Travis Ralston 92db2b85f3
Merge pull request #7444 from aaronraimist/promise-defer
Fix riot-web Promise.defer warnings (#7409)
2018-10-08 21:18:22 -06:00
Aaron Raimist d836ad8dbc
Undo turning warnings back on (#7409)
I guess that turns on warnings for everything, not just riot-web

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-05 11:05:25 -05:00
Aaron Raimist d035efb14e
Fix lint warnings and turn warnings back on (#7409)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-05 10:41:45 -05:00
Aaron Raimist 401c85ad5b
Fix Promise.defer warnings in WebPlatform.js (#7409)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-05 10:23:06 -05:00
Aaron Raimist 54c46df0dc
Fix Promise.defer warnings in index.js (#7409)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-05 10:23:06 -05:00
Aaron Raimist a5fb33de02
Fix Promise.defer warnings in getconfig.js (#7409)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-05 10:23:05 -05:00
Travis Ralston b09aa2cff3
Merge pull request #7459 from vector-im/travis/https-clone
Use HTTPS cloning for riot-web too
2018-10-05 08:58:58 -06:00
Bruno Windels d4576dcf9f
Merge pull request #7463 from vector-im/dbkr/disable_auto_reload
Disable webpack-dev-server auto reload
2018-10-05 15:00:23 +02:00
David Baker 4e6f48df03 Disable webpack-dev-server auto reload
As per comment
2018-10-05 13:56:37 +01:00
David Baker e28180f3d5
Merge pull request #7462 from vector-im/dbkr/gone_away_is_the_bluebird
Silence bluebird warnings
2018-10-05 13:25:26 +01:00
David Baker bccccb2758 Silence bluebird warnings 2018-10-05 12:15:29 +01:00
Travis Ralston a9e98e6711
Merge pull request #7443 from MTRNord/patch-9
Fix reskindex on matrix-react-side not being called if using build script
2018-10-04 11:33:34 -06:00
Travis Ralston 3286acd306
Use HTTPS cloning for riot-web too 2018-10-04 11:23:42 -06:00
Bruno Windels 4d3df8b86b
Merge pull request #7454 from vector-im/dbkr/double_closing_tags
Fix double-closed tags
2018-10-04 13:45:14 +02:00
David Baker a356264801 Fix double-closed tags 2018-10-04 10:49:28 +01:00
Travis Ralston 92b2980b41
Merge pull request #7435 from aaronraimist/patch-1
Document how to turn off Piwik and bug reports (#6738)
2018-10-02 22:53:40 -06:00
Aaron Raimist eabcc9261d
Add text saying that bug reports aren't automatic
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-02 22:58:49 -05:00
Marcel ad5be455bb
Fix reskindex on matrix-react-side not being called if using build script 2018-10-03 02:00:35 +02:00
David Baker f69869ac1e
Merge pull request #7429 from vector-im/bwindels/alsocommitlockfile
also commit the lock file when bumping version as it is now committed to the repo
2018-10-02 12:13:04 +01:00
Aaron Raimist d256194255
Document how to turn off Piwik and bug reports (#6738) 2018-10-01 20:21:13 -05:00
Bruno Windels 4de63e612d also commit the lock file when bumping version as it is now committed to the repo 2018-10-01 17:18:31 +02:00
Bruno Windels 0a4e3379f9 Merge branch 'master' into develop 2018-10-01 17:03:54 +02:00
Bruno Windels e355753900 also update package-lock file 2018-10-01 17:01:07 +02:00
Bruno Windels 712d020dfa v0.16.5 2018-10-01 16:51:39 +02:00
Bruno Windels 5fc53f19f4 Prepare changelog for v0.16.5 2018-10-01 16:51:39 +02:00
Bruno Windels 957fde964b v0.16.5 2018-10-01 16:48:52 +02:00
Bruno Windels b9688acdf5 bump both SDKs to latest version 2018-10-01 16:16:25 +02:00
David Baker 2a8c7b260a Don't show mobile guide if deep linking
Other part of https://github.com/vector-im/riot-web/issues/7378
2018-10-01 15:14:40 +02:00
David Baker a2c7ef5424 Don't show custom server bit on matrix.org
On mobile guide

Part of https://github.com/vector-im/riot-web/issues/7378
2018-10-01 15:14:18 +02:00
David Baker 894ad32e83
Merge pull request #7393 from vector-im/dbkr/update_deps_2
Update a bunch of deps
2018-10-01 09:41:14 +01:00
Bruno Windels aac40c8c58 Merge branch 'develop' into matthew/dharma 2018-09-28 16:52:38 +02:00
Bruno Windels 4e4906605b
Merge pull request #7415 from vector-im/dbkr/mobile_guide_deep_link
Don't show mobile guide if deep linking
2018-09-28 13:34:11 +01:00
David Baker 894e31fe73 Don't show mobile guide if deep linking
Other part of https://github.com/vector-im/riot-web/issues/7378
2018-09-28 11:23:46 +01:00
David Baker 67a762aeaf Actually update package.json 2018-09-28 11:02:14 +01:00
David Baker 28f1140588 Merge remote-tracking branch 'origin/develop' into dbkr/update_deps_2
Updates a bunch more deps now we've updated webpack
2018-09-28 10:58:22 +01:00
David Baker ac81080185
Merge pull request #7408 from vector-im/dbkr/unnecessary_custom_server
Don't show custom server bit on matrix.org
2018-09-28 10:32:06 +01:00
David Baker bc8323f96b Don't show custom server bit on matrix.org
On mobile guide

Part of https://github.com/vector-im/riot-web/issues/7378
2018-09-27 18:19:33 +01:00
Matthew Hodgson a38661c0f0
Merge pull request #7387 from vector-im/matthew/webpack4
Webpack4
2018-09-27 16:21:43 +01:00
Bruno Windels 57cdd26d4d v0.16.5-rc.1 2018-09-27 14:50:38 +01:00
Bruno Windels 582b67c42e v0.16.5-rc.1 2018-09-27 14:48:40 +01:00
Bruno Windels 44791a65b8 Revert "v0.16.5-rc.1"
This reverts commit 81dfe506ac.
2018-09-27 14:46:42 +01:00
Bruno Windels f3214b7891 Prepare changelog for v0.16.5-rc.1 2018-09-27 14:43:05 +01:00
Bruno Windels 81dfe506ac v0.16.5-rc.1 2018-09-27 14:42:14 +01:00
Bruno Windels 2356524d1c bump matrix-js-sdk and matrix-react-sdk 2018-09-27 13:55:06 +01:00
Bruno Windels a371bede4d
Merge pull request #7395 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-09-26 18:15:03 +01:00
David Baker 2166213400 Update a bunch of deps
To try & get deps without vulns in them.

Exceptions are:
 * electron builder: which is nontrivial to update
 * webpack-dev-server: probably needs newer webpack
 * moderizr: no new version released yet
2018-09-26 12:37:40 +01:00
Matthew Hodgson c4f6158f46 pin karma-webpack to 4.0.0-beta.0 to fix perf regression
so karma-webpack 3.0.5 is 4x slower than 4.0.0-beta.0 for webpacking for unknown reasons.
However, 4.0.0-rc.1 and 4.0.0-rc.2 fail with a different error. So: pinned for now
2018-09-26 03:12:08 +01:00
Matthew Hodgson 7e33ea351d upgrade karma & babel to latest 2018-09-26 02:27:22 +01:00