Commit Graph
8275 Commits
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
Weblate f283e68073 Merge branch 'origin/develop' into Weblate. 2019-10-10 14:54:15 +00:00
Sava RadošandWeblate 83ed26e5b9 Translated using Weblate (Serbian (latin))
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/sr_Latn/
2019-10-10 14:54:15 +00:00
Sava RadošandWeblate 0d213fc6db Translated using Weblate (Serbian)
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/sr/
2019-10-10 14:54:14 +00:00
J. Ryan StinnettandGitHub 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 JohnstonandGitHub 82286d45ed Update config.json 2019-10-10 15:50:19 +01:00
David Baker 2bab328f8d Check everything's in place for the notarising dance
...before we start the build process.
2019-10-10 15:32:17 +01:00
David Baker a7d1d9880b Use my fork of electron-notarize
if only to test it
2019-10-10 14:56:35 +01:00
Erik JohnstonandGitHub 76ce250421 Update config.json 2019-10-10 14:35:56 +01:00
Erik JohnstonandGitHub 0533e559ae Update config.json 2019-10-10 14:35:10 +01:00
Erik JohnstonandGitHub 19e0848698 Update develop config too 2019-10-10 14:21:37 +01:00
Erik JohnstonandGitHub 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 29f186bc18 add electron-notarize 2019-10-10 11:57:39 +01:00
David Baker 7faba49f66 fix quotes 2019-10-10 11:53:49 +01:00
RiotRobot 561d0c9a4c v1.5.0-rc.1 2019-10-09 17:37:00 +01:00
RiotRobot 358d27f2ba Prepare changelog for v1.5.0-rc.1 2019-10-09 17:37:00 +01:00
RiotRobot f89fd9c888 v1.5.0-rc.1 2019-10-09 17:35:48 +01:00
Sava RadošandWeblate 3faf1912af Added translation using Weblate (Serbian (latin)) 2019-10-09 16:13:15 +00:00
RiotRobot b18e4f079f js-sdk & react-sdk rc.1 2019-10-09 17:00:22 +01:00
David Baker bad97db302 remove random spaces 2019-10-09 16:40:31 +01:00
David BakerandGitHub d120c3b93e Merge pull request #11104 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2019-10-09 16:37:30 +01:00
David Baker ff70339aad Working branch for notarisation 2019-10-09 16:29:24 +01:00
Weblate c7d8a24f4e Merge branch 'origin/develop' into Weblate. 2019-10-09 14:48:22 +00:00
David BakerandGitHub 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 StinnettandGitHub 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 ConradandWeblate 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
vverstandGitHub 2e5b0fb72d Add darkModeSupport 2019-10-09 09:04:45 +02:00
Bruno WindelsandGitHub 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 RalstonandGitHub 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 BakerandGitHub 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 BakerandGitHub b99bdbcd4e Revert "Run yarn upgrade" 2019-10-04 16:19:29 +01:00
David BakerandGitHub e0c2131869 Merge pull request #11050 from vector-im/dbkr/yarn_upgrade_20191004
Run yarn upgrade
2019-10-04 15:08:26 +01:00
David BakerandGitHub 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 WindelsandGitHub 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