Commit Graph

28794 Commits

Author SHA1 Message Date
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
Bruno Windels
5129bb57b6 log all requests with their response code 2018-07-31 10:35:21 +02:00
Bruno Windels
29d688543d stop servers on error in run script 2018-07-31 10:35:21 +02:00
Bruno Windels
758da78659 dont fail when trying to stop riot and its not running 2018-07-31 10:35:21 +02:00
Bruno Windels
5cd52e2ebd show browser logs on error 2018-07-31 10:35:21 +02:00
Bruno Windels
976f041bba remove test exit, and use port we are semi-sure is free 2018-07-31 10:35:21 +02:00
Bruno Windels
e8f626ba18 exit on error 2018-07-31 10:35:21 +02:00
Bruno Windels
c3b7e6c7cb make scripts executable, running them with sh does something weird on travis 2018-07-31 10:35:21 +02:00
Bruno Windels
edf37e3592 add support for passing chrome path as env var 2018-07-31 10:35:21 +02:00
Bruno Windels
20becf8735 force running scripts in bash, as it's not the default shell on Ubuntu (which is what Travis runs) 2018-07-31 10:35:21 +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
Matthew Hodgson
fe73953d9d fix merge; disable sticky headers; tweak chevrons 2018-07-30 09:00:11 -07: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
Miguel L
d4d173c98c Translated using Weblate (Spanish)
Currently translated at 62.8% (765 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 11:09:22 +00:00
David Baker
2f13615dd1 Merge branch 'master' into develop 2018-07-30 12:09:07 +01:00
David Baker
3c8fc5a8af v0.13.0 2018-07-30 11:57:53 +01:00
David Baker
1ebcd0f0ec Prepare changelog for v0.13.0 2018-07-30 11:53:15 +01:00
David Baker
2df3580c60 Released js-sdk 2018-07-30 11:46:28 +01:00
Weblate
04c8b802b0 Merge remote-tracking branch 'origin/develop' into develop 2018-07-29 18:44:59 +00:00
Miguel L
c77aa7d27e Translated using Weblate (Spanish)
Currently translated at 62.7% (764 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-07-29 18:44:58 +00:00
Никола
0a27b4d080 Translated using Weblate (Serbian)
Currently translated at 98.9% (1205 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-07-29 18:44:58 +00:00
Michael Telatynski
2bc4dcc7da Merge pull request #2096 from matrix-org/dbkr/click_on_side_panels_closes_settings_3
Make clicking on side panels close settings (mk 3)
2018-07-29 19:44:53 +01:00
Matthew Hodgson
9783b6100d Merge branch 'develop' into matthew/dharma 2018-07-29 17:03:23 +01:00
Slavi Pantaleev
44b281083c Translated using Weblate (Bulgarian)
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/bg/
2018-07-27 19:08:55 +00:00
David Baker
f4c073ad45 Nest ifs to avoid unnecessary work 2018-07-27 18:58:11 +01:00
David Baker
e059a08d7b Make clicking on side panels close settings (mk 3)
Just do it by fixing the somewhat hacky logic to not break if the
target elements also have additional classes, like they do if the
toolbar is showing (I think it turns out this bug is only that it
doesn't work with the toolbar showing...)

Fixes https://github.com/vector-im/riot-web/issues/5658
2018-07-27 18:53:36 +01:00
David Baker
897d18bffb Merge pull request #2093 from matrix-org/t3chguy/slate_cont2
Fix composer bug where cursor position would change when Riot regained focus
2018-07-27 15:42:35 +01:00
David Baker
8a99c712c1 Merge pull request #2094 from matrix-org/dbkr/reposition_jitsi__release
Fix persistend element location not updating
2018-07-27 15:42:21 +01:00
Weblate
9593e8c4fd Merge remote-tracking branch 'origin/develop' into develop 2018-07-27 13:51:34 +00:00
David Baker
148308235d Merge pull request #2092 from matrix-org/dbkr/reposition_jitsi
Fix persistent element location not updating
2018-07-27 14:51:29 +01:00
David Baker
1c0f778e82 Fix persistend element location not updating
As hopefully all explained in comment
2018-07-27 14:42:58 +01:00
David Baker
1fe0f04986 Fix persistend element location not updating
As hopefully all explained in comment
2018-07-27 14:33:05 +01:00
Bruno Windels
ebc9859cce add instruction to install without chrome download 2018-07-27 15:07:43 +02:00
Bruno Windels
5389a42bc1 use readlink instead of realpath as it seems to be more portable 2018-07-27 15:04:04 +02:00
Weblate
c62562eb59 Merge remote-tracking branch 'origin/develop' into develop 2018-07-27 13:01:01 +00:00
Kyf Lee
1e9f2f112d Translated using Weblate (Korean)
Currently translated at 96.7% (1179 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2018-07-27 13:01:00 +00:00
David Baker
b6ebb0cc37 Merge pull request #2089 from matrix-org/t3chguy/slate_cont2
Slate Fixes 42?
2018-07-27 14:00:53 +01:00
Bruno Windels
5e1517eb4d no need for push/popd in sub-shell 2018-07-27 14:10:19 +02:00
Bruno Windels
96374f4e54 only install synapse and riot if directory is not already there 2018-07-27 14:00:01 +02:00
Bruno Windels
a4e7b14728 update README 2018-07-27 13:50:58 +02:00
Bruno Windels
b3473a7220 with no logs polluting the output, we dont need tmux anymore to split the terminal 2018-07-27 13:43:38 +02:00
Bruno Windels
a6304ce83e now the output isn't overwhelming anymore, output what's happening at every step 2018-07-27 13:43:12 +02:00
Bruno Windels
0be2e02381 hide synapse schema update logs by redirecting stderr 2018-07-27 13:42:36 +02:00
Bruno Windels
c9461dd296 hide riot static server output 2018-07-27 13:29:59 +02:00
Bruno Windels
6ae5a7bd97 Merge pull request #1 from matrix-org/bwindels/join-with-consent
join with consent dialog
2018-07-27 12:11:51 +02:00