Commit Graph

7857 Commits (9d91e6366d1383e62eb6cdcd04a2f894a8af73f3)

Author SHA1 Message Date
Bruno Windels 9d91e6366d Merge branch 'develop' into bwindels/merge-e2e-tests 2019-10-10 18:28:56 +02:00
Bruno Windels d1a5376dae clarify where the e2e tests are located 2019-10-10 16:54:52 +02:00
J. Ryan Stinnett a0599e84d9
Merge pull request #11112 from vector-im/erikj/move_matrix_client
Update default HS config to match well-known
2019-10-10 15:54:08 +01:00
Erik Johnston 82286d45ed
Update config.json 2019-10-10 15:50:19 +01:00
Erik Johnston 76ce250421
Update config.json 2019-10-10 14:35:56 +01:00
Erik Johnston 0533e559ae
Update config.json 2019-10-10 14:35:10 +01:00
Erik Johnston 19e0848698
Update develop config too 2019-10-10 14:21:37 +01:00
Erik Johnston a49e1a70db
Update default HS config to match well-known
We want to move matrix.org client traffic to `https://matrix-client.matrix.org
2019-10-10 14:20:40 +01:00
David Baker d120c3b93e
Merge pull request #11104 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2019-10-09 16:37:30 +01:00
Weblate c7d8a24f4e Merge branch 'origin/develop' into Weblate. 2019-10-09 14:48:22 +00:00
David Baker d903214ddf
Merge pull request #11103 from vector-im/dbkr/olm_session_describe
Bump Olm to 3.1.4 for olm_session_describe
2019-10-09 15:48:18 +01:00
David Baker b6d1d0bf5d Bump Olm to 3.1.4 for olm_session_describe 2019-10-09 15:40:25 +01:00
Weblate 4113d6a2f3 Merge branch 'origin/develop' into Weblate. 2019-10-09 14:05:40 +00:00
J. Ryan Stinnett 56c0d3ec33
Merge pull request #11098 from vector-im/jryans/start-js-prod-mode
Enable Webpack production mode for start:js:prod
2019-10-09 15:05:35 +01:00
Claus Conrad 1a36160c90 Translated using Weblate (Danish)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/da/
2019-10-09 11:52:02 +00:00
J. Ryan Stinnett fce5b4dd78 Enable Webpack production mode for start:js:prod
The (rarely used) `start:js:prod` script for running production mode locally
failed to set Webpack into production mode, so things like minification would be
skipped.
2019-10-09 10:59:44 +01:00
Bruno Windels 57e597ec13
Merge pull request #9919 from vector-im/bwindels/settings-config-doc
add settingDefaults to sample config
2019-10-07 14:10:51 +00:00
Bruno Windels 259ca06f73 add example default setting 2019-10-07 14:46:50 +02:00
Travis Ralston c0a148c018
Merge pull request #11062 from MichaelKohler/fix-readme-config-mention
Add config.json copy instruction to 'Development' as well
2019-10-06 09:55:15 -06:00
Michael Kohler 9e27cb713f Add config.json copy instruction to 'Development' as well 2019-10-06 13:04:20 +02:00
David Baker 644a46bdfd
Merge pull request #11055 from vector-im/revert-11050-dbkr/yarn_upgrade_20191004
Revert "Run yarn upgrade"
2019-10-04 16:20:33 +01:00
David Baker b99bdbcd4e
Revert "Run yarn upgrade" 2019-10-04 16:19:29 +01:00
David Baker e0c2131869
Merge pull request #11050 from vector-im/dbkr/yarn_upgrade_20191004
Run yarn upgrade
2019-10-04 15:08:26 +01:00
David Baker 9981f897a4
Merge pull request #11052 from vector-im/dbkr/persist_storage_on_desktop
Request persistent storage on Electron
2019-10-04 15:01:50 +01:00
David Baker 57672ad384 Request persistent storage on Electron
It's still not 100% clear whether storage is always persistent on
Electron, but we seem to be getting reports of it being deleted in
the wild on Electron, so let's try calling the API to request
persistent storage. It won't pop up a dialog on Electron. In the
worst case it will give us some logging so we know what the API calls
return.

We could do this on non-desktop too but it's a bit of a mess because
Firefox prompts the user but Chrome makes a decision itself based on
how much the user visits the site.
2019-10-04 12:17:01 +01:00
Bruno Windels 26cbd16b40
Merge pull request #11047 from vector-im/travis/enable-cider
Remove docs for CIDER feature
2019-10-04 10:24:57 +00:00
David Baker 64a961ec00 Run yarn upgrade 2019-10-04 11:13:03 +01:00
David Baker af57c9e321 js-sdk & react-sdk develop 2019-10-04 11:08:08 +01:00
RiotRobot 685d913171 v1.4.2 2019-10-04 10:41:06 +01:00
RiotRobot b41452162c Prepare changelog for v1.4.2 2019-10-04 10:41:06 +01:00
RiotRobot ef473f930a v1.4.2 2019-10-04 10:40:15 +01:00
RiotRobot b333058b57 released react-sdk 2019-10-04 10:39:53 +01:00
David Baker 7df140c164 electron version bump 2019-10-04 10:21:27 +01:00
David Baker ef1fd9e428 Merge remote-tracking branch 'origin/develop' into release-v1.4.2 2019-10-04 10:17:56 +01:00
Travis Ralston 98b4681dc5 Remove docs for CIDER feature
See https://github.com/matrix-org/matrix-react-sdk/pull/3519
2019-10-03 23:21:52 -06:00
David Baker b312b4d502
Merge pull request #11031 from vector-im/travis/mem-docs
Document troubleshooting for memory leaks and getting profiles
2019-10-03 11:04:39 +01:00
Travis Ralston 509ed81294 Document troubleshooting for memory leaks and getting profiles
People find this useful.
2019-10-02 09:06:13 -06:00
RiotRobot 1ba2731391 v1.4.2-rc.1 2019-10-02 10:33:37 +01:00
RiotRobot e599fafdfd Prepare changelog for v1.4.2-rc.1 2019-10-02 10:33:37 +01:00
RiotRobot caac5466ba v1.4.2-rc.1 2019-10-02 10:32:13 +01:00
David Baker d83c942fe5 released js-sdk & react-sdk 2019-10-02 10:30:13 +01:00
Bruno Windels c0a0466b6c
Merge pull request #11017 from vector-im/bwindels/custom-themes-mvp
Custom themes MVP
2019-10-02 09:14:18 +00:00
Bruno Windels 31dc423d1d line wrap 2019-10-02 09:04:36 +02:00
Bruno Windels beaf6b0e0d document settingsDefault now I'm using it and had to look it up again 2019-10-01 17:01:45 +02:00
Bruno Windels 4273f2cc55 add support for dark custom theme 2019-10-01 17:01:16 +02:00
Travis Ralston 6173841768
Merge pull request #11007 from vector-im/travis/permalinks
Document permalinkPrefix setting
2019-10-01 08:41:29 -06:00
J. Ryan Stinnett f7a08e8d27 Change back to develop branch for deps 2019-10-01 13:32:36 +01:00
RiotRobot be0b4e9072 v1.4.1 2019-10-01 11:52:23 +01:00
RiotRobot 57e4e4ee0d Prepare changelog for v1.4.1 2019-10-01 11:52:22 +01:00
RiotRobot 2bb24892df v1.4.1 2019-10-01 11:48:11 +01:00