mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-13 14:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity
11499 commits 219 branches 562 tags 474 MiB
Commit graph

11499 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bruno Windels
f1643f77ac fix lint 2018-08-02 19:57:20 +02:00
Bruno Windels
42fc83d2a8 Move LL filter creation inside MatrixClient 
As we need an option to turn lazy loading on (we can't just accept a filter,
as /messages has an incompatible filter), better only pass the option
and create the filter inside startClient
 2018-08-02 19:38:41 +02: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
Bruno Windels
e1843601be support directional content in pill member fake 2018-08-02 17:09:18 +02: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
Bruno Windels
4b96e01410 enable newly introduced option 2018-08-02 13:01:57 +02: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
802efc7694 given the != join check, isInvite will never be true 
Also, put comments in right order
 2018-08-02 11:47:24 +02:00
Bruno Windels
b151956f7b Use room method to help with DM detection with fallback to summary heroes/counts. 2018-08-02 11:42:19 +02:00
Bruno Windels
908de56c6d replace getMember(myId).membership with getMyMembership 
This works with rooms which haven't had their members
loaded yet.
 2018-08-02 11:42:05 +02:00
Bruno Windels
b9bbb7ee16 pass in userId with room in test 2018-08-02 11:40:56 +02: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
David Baker
7875d37c8e Destroy non-persistent widgets when switching room 2018-08-01 15:01:11 +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
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
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