Weblate
64e3e6ed78
Merge remote-tracking branch 'origin/develop' into develop
2018-08-03 16:01:33 +00:00
Bruno Windels
4c6d5f50e9
Merge pull request #2108 from matrix-org/dbkr/chairman_mau_pt_3_sync_error
...
Support MAU error on sync
2018-08-03 18:01:28 +02:00
David Baker
cd18744101
unused import
2018-08-03 16:10:50 +01:00
David Baker
9a2155f1ad
Oops, add file to right branch
2018-08-03 16:03:27 +01:00
David Baker
c36779fc15
d'oh, didn't mean to push this to develop
2018-08-03 16:02:51 +01:00
Weblate
b2bd67ac8d
Merge remote-tracking branch 'origin/develop' into develop
2018-08-03 15:01:42 +00:00
David Baker
0c8943cdc0
Oops, add the file
2018-08-03 16:01:22 +01:00
Jeff Huang
fcf5101069
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-08-03 13:55:43 +00:00
David Baker
b5d2fa769c
Support MAU error on sync
...
For https://github.com/vector-im/riot-web/issues/7091
2018-08-03 14:54:52 +01:00
Kévin C
9ce74be016
Translated using Weblate (French)
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-08-03 13:16:11 +00:00
Weblate
7aeb790b4a
Merge remote-tracking branch 'origin/develop' into develop
2018-08-03 12:14:23 +00:00
David Baker
bc1d359398
Merge pull request #2106 from matrix-org/dbkr/chairman_mau_pt_2_message_send
...
Support active user limit on message send
2018-08-03 13:14:18 +01:00
Weblate
f47e0ebc65
Merge remote-tracking branch 'origin/develop' into develop
2018-08-03 10:42:34 +00:00
Krombel
de85254ab0
Translated using Weblate (German)
...
Currently translated at 100.0% (1214 of 1214 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-08-03 10:42:33 +00:00
David Baker
b322f0b291
Merge pull request #2091 from matrix-org/bwindels/e2e-tests-ci-script
...
Run end to end tests as part of Travis build
2018-08-03 11:42:28 +01:00
Bruno Windels
e2695fb467
now the ci scripts are merged in the test repo, change the branch to fetch them from to master
2018-08-03 11:43:12 +02:00
Slavi Pantaleev
e7fa3b1666
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (1214 of 1214 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-08-03 09:34:27 +00:00
Krombel
511e11a517
Translated using Weblate (German)
...
Currently translated at 100.0% (1214 of 1214 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-08-03 09:01:59 +00:00
Weblate
45b180e476
Merge remote-tracking branch 'origin/develop' into develop
2018-08-03 08:14:30 +00:00
Andrey
54e2702d78
Translated using Weblate (Russian)
...
Currently translated at 99.2% (1205 of 1214 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-08-03 08:14:29 +00:00
David Baker
86c5fac030
Merge pull request #2097 from matrix-org/dbkr/remove_package_lock
...
Remove package-lock.json for now
2018-08-03 09:14:24 +01:00
Kévin C
44f6520755
Translated using Weblate (French)
...
Currently translated at 100.0% (1214 of 1214 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-08-03 07:44:22 +00:00
Weblate
e21ba655aa
Merge remote-tracking branch 'origin/develop' into develop
2018-08-03 07:32:14 +00:00
Bruno Windels
74ee7069e2
Merge pull request #2103 from matrix-org/dbkr/chairman_mau_pt_1_login
...
Support montly active user limit error on /login
2018-08-03 09:32:08 +02:00
David Baker
d25fc9d9fb
Revert 3f0c948387
...
...as hopefully this should work now sanitize-html is fixed?
2018-08-02 19:37:27 +01:00
David Baker
02019a58b3
Support active user limit on message send
...
For https://github.com/vector-im/riot-web/issues/7091
2018-08-02 17:09:04 +01:00
Weblate
4c8f437cfc
Merge remote-tracking branch 'origin/develop' into develop
2018-08-02 15:52:24 +00:00
Bruno Windels
2b5c8282d0
Merge pull request #2105 from matrix-org/dbkr/unpin_sanitize_html
...
Unpin sanitize-html
2018-08-02 17:52:15 +02:00
David Baker
d25ed88b0d
Unpin sanitize-html
...
1.18.4 is now out which makes it work with webpack again
2018-08-02 16:20:55 +01:00
Osoitz
dbe28558c2
Translated using Weblate (Basque)
...
Currently translated at 100.0% (1218 of 1218 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-08-02 15:17:08 +00:00
David Baker
bb9a3eb33d
Support MAU limit error on register too
2018-08-02 16:09:57 +01:00
David Baker
cc58b06226
Support montly active user limit error on /login
...
The 'contact your service administrator' should be a link but we
don't have this info from the HS yet.
2018-08-02 14:25:17 +01:00
Weblate
c47f952e1a
Merge remote-tracking branch 'origin/develop' into develop
2018-08-02 10:05:43 +00:00
kR
a6106ddc4f
Translated using Weblate (Polish)
...
Currently translated at 92.6% (1129 of 1218 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-08-02 10:05:42 +00:00
Brendan Abolivier
34259591ae
Translated using Weblate (French)
...
Currently translated at 100.0% (1218 of 1218 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-08-02 10:05:42 +00:00
Bruno Windels
d1dcd0f374
Merge pull request #2101 from matrix-org/dbkr/pin_sanitize_html
...
Pin sanitize-html to 0.18.2
2018-08-02 12:05:37 +02:00
David Baker
4575710c84
Pin sanitize-html to 0.18.2
...
Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241
/ https://github.com/punkave/sanitize-html/issues/242
2018-08-02 10:59:26 +01:00
Bruno Windels
3f0c948387
try logging the stack to see where the TypeError on travis occurs exactly
2018-08-01 18:46:40 +02:00
David Baker
de43cc920d
Add package-lock to gitignore
2018-08-01 15:07:17 +01:00
adrian-007
f137151a7a
Translated using Weblate (Polish)
...
Currently translated at 92.6% (1129 of 1218 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-08-01 08:53:33 +00:00
David Baker
f0d135d76e
Remove package-lock.json for now
...
As per https://github.com/vector-im/riot-web/issues/7083
The package-lock file is currently not bringing any of the benefits
it's supposed to bring because we don't do the neccessary things to
massage it during the release process. Remove it until we actually
manage it correctly.
2018-07-31 11:02:14 +01:00
Bruno Windels
6f60b68ac7
Puppeteer does need it's own chrome after all
...
The stable chrome travis provides is not supported.
2018-07-31 11:00:44 +02:00
Bruno Windels
93f51eb6ce
force running scripts in bash, as it's not the default shell on Ubuntu (which is what Travis runs)
2018-07-31 11:00:44 +02:00
Bruno Windels
70f8ee0e87
install synapse prerequisites as part of build
2018-07-31 11:00:44 +02:00
Bruno Windels
e08e09df9a
pass location of google-chrome-stable to e2e test runner
2018-07-31 11:00:44 +02:00
Bruno Windels
0ee72a2972
disable tests for now to speed up trying stuff out, run the build as well
2018-07-31 11:00:44 +02:00
Bruno Windels
fd5193b9f4
try to run e2e tests in travis
2018-07-31 10:39:30 +02:00
Miguel L
320f38a56a
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (1218 of 1218 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-07-30 17:24:12 +00:00
Krombel
fbdd618f58
Translated using Weblate (German)
...
Currently translated at 100.0% (1218 of 1218 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-07-30 13:14:32 +00:00
Weblate
9b0963c9af
Merge remote-tracking branch 'origin/develop' into develop
2018-07-30 11:09:22 +00:00