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

11023 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
239b86712d Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 11:08:32 +00:00
Luke Barnard
e0a3debb7a prune-i18n 2018-05-24 12:08:22 +01:00
Luke Barnard
8dcf43a88d gen-i18n 2018-05-24 12:08:05 +01:00
Weblate
7674668f1c Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 11:02:15 +00:00
Osoitz
4c38d7a5cd Translated using Weblate (Basque) 
Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-05-24 11:02:14 +00:00
Luke Barnard
03c97140a6
Merge pull request #1925 from matrix-org/luke/deactivate-account-reword 
Change wording and appearance of Deactivate Account dialog
 2018-05-24 12:02:10 +01:00
Luke Barnard
dca1217a45 Change wording and appearance of Deactivate Account dialog 2018-05-24 11:50:45 +01:00
Weblate
6e1e19fe0d Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 10:29:34 +00:00
Matthew Hodgson
3bee23e733
Merge pull request #1924 from matrix-org/matthew/fix-memberlist-ordering 
fix membership list ordering when presence is disabled.
 2018-05-24 11:29:29 +01:00
Szimszon
2e67eecf3d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-05-24 10:23:46 +00:00
Kévin C
a2946b0796 Translated using Weblate (French) 
Currently translated at 100.0% (1185 of 1185 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-05-24 10:09:11 +00:00
Weblate
9a1761ce78 Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 09:49:06 +00:00
stuve20
8907469f06 Translated using Weblate (Swedish) 
Currently translated at 81.2% (959 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-24 09:49:06 +00:00
Andrey
03684f2720 Translated using Weblate (Russian) 
Currently translated at 99.8% (1178 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-05-24 09:49:06 +00:00
Luke Barnard
a8f6ebe567
Merge pull request #1922 from matrix-org/luke/erase-on-deactivate 
Implement erasure option upon deactivation
 2018-05-24 10:48:57 +01:00
Osoitz
16987c3ef2 Translated using Weblate (Basque) 
Currently translated at 100.0% (1180 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-05-24 07:02:54 +00:00
Matthew Hodgson
cc79384839 fix https://github.com/vector-im/riot-web/issues/6643 2018-05-24 01:57:22 +01:00
Kenneth Larsson
a0e3ec5307 Translated using Weblate (Swedish) 
Currently translated at 81.1% (958 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-23 20:37:06 +00:00
stuve20
3f229d5c55 Translated using Weblate (Swedish) 
Currently translated at 81.1% (958 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-23 20:34:43 +00:00
Kenneth Larsson
7b00982a35 Translated using Weblate (Swedish) 
Currently translated at 81.1% (957 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-23 20:33:08 +00:00
Matthew Hodgson
864a33f978 switch to using 'code' for both blocks & marks to match md-serializer 2018-05-23 20:12:13 +01:00
Richard Lewis
7da51f2bd4 Remove max-width restriction (no longer makes sense). 2018-05-23 18:40:48 +01:00
Richard Lewis
7db31835b4 Remove unused / misspelt class. 2018-05-23 18:24:52 +01:00
Richard Lewis
2a9859c7b6 Styling for consistency. 2018-05-23 17:40:15 +01:00
Richard Lewis
9f9cde12ce Make devTools styling more consistent and easier to edit event data. 2018-05-23 17:18:33 +01:00
Luke Barnard
b124989968 Implement erasure option upon deactivation 2018-05-23 16:33:32 +01:00
Matthew Hodgson
294565c47e switch code schema to match slate-md-serializer 2018-05-23 14:12:36 +01:00
Matthew Hodgson
b0ff61f7ef switch code schema to match slate-md-serializer 2018-05-23 14:12:08 +01:00
Matthew Hodgson
fb5240aabd explain why we're now including <p/>s 2018-05-23 14:00:54 +01:00
Luke Barnard
ba3dd0c87a Refactor onOk to async function 2018-05-23 13:35:42 +01:00
Matthew Hodgson
87c3e92014 bump dep 2018-05-23 13:32:48 +01:00
Kévin C
94f7d1b224 Translated using Weblate (French) 
Currently translated at 100.0% (1180 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-05-23 10:42:18 +00:00
Szimszon
b9f597b75f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1180 of 1180 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-05-23 10:16:09 +00:00
Weblate
0baeedec9c Merge remote-tracking branch 'origin/develop' into develop 2018-05-23 10:07:21 +00:00
Kenneth Larsson
a6e7a8106c Translated using Weblate (Swedish) 
Currently translated at 78.2% (923 of 1179 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-23 10:07:21 +00:00
Luke Barnard
a6cc0406dd
Merge pull request #1921 from matrix-org/luke/widget-cookie-warning 
Add cookie warning to widget warning (AppPermission)
 2018-05-23 11:07:16 +01:00
Luke Barnard
ef686a966d Add cookie warning to widget warning (AppPermission) 2018-05-23 10:46:32 +01:00
Weblate
c11635172e Merge remote-tracking branch 'origin/develop' into develop 2018-05-23 09:17:19 +00:00
Kenneth Larsson
424dea1d4a Translated using Weblate (Swedish) 
Currently translated at 77.2% (909 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-05-23 09:17:19 +00:00
Luke Barnard
c1a42637e7
Merge pull request #1919 from matrix-org/luke/consent-dialog 
Terms and Conditions dialog
 2018-05-23 10:17:14 +01:00
Matthew Hodgson
5b4a036e8c bump dep 2018-05-23 03:53:05 +01:00
Matthew Hodgson
f40af434bc unbreak Markdown.toPlaintext 2018-05-23 03:46:53 +01:00
Matthew Hodgson
95bfface99 comment out broken logic for stripping p tags & bump dep 2018-05-23 03:43:40 +01:00
Matthew Hodgson
079b1238a1 bump right dep 2018-05-23 03:20:59 +01:00
Matthew Hodgson
a822a1c9a0 bump dep 2018-05-23 03:19:33 +01:00
Matthew Hodgson
6f3634c33f bump slate-md-serializer 2018-05-23 03:08:55 +01:00
Matthew Hodgson
edc8264cff shift to custom slate-md-serializer 2018-05-23 02:48:57 +01:00
Matthew Hodgson
fc1c4996fc slate-md-serializer 3.1.0 now escapes correctly 2018-05-23 02:15:34 +01:00
Matthew Hodgson
6fba8311f9 escape blockquotes correctly 
and fix NPE
 2018-05-23 02:09:37 +01:00
Matthew Hodgson
6ac2324874 fix wordwrap and pre formatting 2018-05-23 01:43:03 +01:00