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

10385 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Luke Barnard
ba3dd0c87a Refactor onOk to async function 2018-05-23 13:35:42 +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
Jeff Huang
ab5a4f58a2 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1176 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-05-22 23:56:28 +00:00
Richard Lewis
975332633b Translation. 2018-05-23 00:26:55 +01:00
Szimszon
97f57edba7 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1176 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-05-22 19:13:01 +00:00
Richard Lewis
6df3371c6c Add a "reload widget" button. 2018-05-22 19:14:54 +01:00
Kévin C
c9c3cf55de Translated using Weblate (French) 
Currently translated at 100.0% (1176 of 1176 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-05-22 17:09:32 +00:00
Luke Barnard
658e88c30f Implement consent/terms and conditions dialog for /_matrix/consent flow 2018-05-22 18:03:56 +01:00
Luke Barnard
538979a4ee Fix MVideoBody spinner 2018-05-22 17:13:45 +01:00
Luke Barnard
c249bee9b5 Grammar 2018-05-22 16:09:54 +01:00
Weblate
f22094dc51 Merge remote-tracking branch 'origin/develop' into develop 2018-05-22 15:07:09 +00:00
Luke Barnard
c47c7b8d98
Merge pull request #1902 from matrix-org/t3chguy/room_settings_muted_users 
improve privileged section users in room settings
 2018-05-22 16:07:01 +01:00
Luke Barnard
e602213806 Add concept of priority modal to modal manager 2018-05-22 15:47:05 +01:00
Luke Barnard
31dcd85c08 Add customisable cancel button to QuestionDialog 2018-05-22 15:45:58 +01:00
Luke Barnard
fb5dd4a410 Remove spurious fixupHeight 2018-05-22 10:46:10 +01:00
Luke Barnard
e4f8c09c32 Only include placeholder in DOM when necessary 2018-05-22 10:43:16 +01:00
Weblate
e8e847e799 Merge remote-tracking branch 'origin/develop' into develop 2018-05-22 08:42:12 +00:00
Andrey
38f446a364 Translated using Weblate (Russian) 
Currently translated at 99.8% (1173 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-05-22 08:42:12 +00:00
random
a0bc681052 Translated using Weblate (Italian) 
Currently translated at 99.4% (1169 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-05-22 08:42:12 +00:00
David Baker
1895f82d62
Merge pull request #1918 from matrix-org/dbkr/leave_room_warning_space 
Space between sentences in 'leave room' warning
 2018-05-22 09:42:06 +01:00
David Baker
ae10491f95 Space between sentences in 'leave room' warning 2018-05-22 09:28:41 +01:00
Luke Barnard
e9ae3de00f Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-05-21 17:15:54 +01:00
Luke Barnard
836dc8b0ef Factor out all shared logic between MStickerBody and MImageBody 
The benefits of this:
 - One code path for determining spinner/placeholder and it's position
   for loading images/stickers. This includes spinner used in e2e
   decryption of images.
 - Very small definition for MStickerBody, only overriding the minimal
   differences is has from MImageBody.

The disadvantages:
 - Slightly more complicated MImageBody, but hopefully not less
   readable.
 2018-05-21 16:59:13 +01:00
Akihiko Odaki
35ab573bc5 Update sinon to 5.0.7 2018-05-21 18:44:00 +09:00
Krombel
bd10768c9e Translated using Weblate (German) 
Currently translated at 100.0% (1175 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-05-18 13:47:19 +00:00