mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 10:15:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
10672 commits 203 branches 553 tags 406 MiB
Commit graph

10672 commits

This branch
This branch
All branches
Author SHA1 Message Date
Will Hunt
83221da7d7 Delint 2018-07-06 16:54:28 +01:00
Will Hunt
9a4075c637 Semicolons 2018-07-06 16:38:04 +01:00
Will Hunt
52b1d946be Remove unused console.log 2018-07-06 16:37:52 +01:00
Will Hunt
1db803ccfc "/n" -> " " 2018-07-06 16:37:40 +01:00
Will Hunt
1ca164f1a9 Change all ban message and move further up 2018-07-06 16:36:44 +01:00
Will Hunt
12ce7839f3 Const things 2018-07-06 16:36:26 +01:00
Will Hunt
8b9fd7ddcb Clean up rules. 2018-07-06 15:31:21 +01:00
Will Hunt
526459a9e0 Capitalise 2018-07-06 11:06:31 +01:00
Will Hunt
a6cff4a969 Show server bans in the timeline 2018-07-06 11:06:31 +01:00
David Baker
de33cf1afe
Merge pull request #2030 from matrix-org/t3chguy/optional_new_behaviour_roomsublist 
make new hiding of roomsublist behaviour opt-in
 2018-07-04 11:42:33 +01:00
Michael Telatynski
168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist 2018-07-04 11:21:16 +01:00
David Baker
4b4864abed
Merge pull request #2040 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-07-04 11:16:13 +01:00
Weblate
64048665ad Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 10:11:58 +00:00
Michael Telatynski
6c91952d26
Merge pull request #2039 from akihikodaki/sticker_upstream 
Import react as React in src/components/views/messages/MStickerBody.js
 2018-07-04 11:11:53 +01:00
Weblate
f4db42351a Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 09:29:58 +00:00
Michael Telatynski
5551855133
Merge pull request #2038 from akihikodaki/group_upstream 
Import react as React in src/GroupAddressPicker.js
 2018-07-04 10:29:53 +01:00
Akihiko Odaki
f941c93322 Import react as React in src/components/views/messages/MStickerBody.js 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-07-04 18:28:56 +09:00
Weblate
71b11199e3 Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 08:20:56 +00:00
Andrey
36d3c3952b Translated using Weblate (Russian) 
Currently translated at 99.8% (1208 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-07-04 08:20:56 +00:00
RainSlide
537e8da553 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 94.5% (1144 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-07-04 08:20:55 +00:00
Luke Barnard
bfbd499737
Merge pull request #2036 from matrix-org/dbkr/many_persistedelements 
Give PersistedElement a key
 2018-07-04 09:20:50 +01:00
Akihiko Odaki
2ddcb83e8d Import react as React in src/GroupAddressPicker.js 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-07-04 10:57:03 +09:00
David Baker
ad35fbf208 Pull out z-index to the sticker picker 
As it's not a thing that's necessary for other PersistedElements,
only the sticker picker because it has to sit above the ContextMenu
it sits in.
 2018-07-03 18:25:33 +01:00
Paweł Kozioł
b69eb8fc88 Translated using Weblate (Polish) 
Currently translated at 92.8% (1124 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-07-03 17:15:28 +00:00
Slavi Pantaleev
c0aa1f1196 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-07-03 14:35:34 +00:00
David Baker
74f2d0a360 Use inline class field for PropTypes 2018-07-03 14:54:43 +01:00
David Baker
3f88721bc1 Give PersistedElement a key 
So there can be more than one on a page
 2018-07-03 14:43:27 +01:00
Kévin C
0ad8d5ed79 Translated using Weblate (French) 
Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-07-03 11:27:07 +00:00
Szimszon
f7b84a412a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-07-03 10:19:09 +00:00
Weblate
00db7f84ff Merge remote-tracking branch 'origin/develop' into develop 2018-07-03 09:36:15 +00:00
David Baker
f429ae5617
Merge pull request #2034 from matrix-org/revert-1945-t3chguy/click_username_state_ev 
Revert " make click to insert nick work on join/parts, /me's etc"
 2018-07-03 10:36:10 +01:00
Michael Telatynski
7225f7372c
Revert " make click to insert nick work on join/parts, /me's etc" 2018-07-03 10:30:08 +01:00
Luke Barnard
767e67dc70
Merge pull request #2033 from matrix-org/luke/track-uisis-piwik-specify-event-name 
Track an event name when tracking a decryption failure
 2018-07-02 10:26:34 +01:00
David Baker
34f6134595
Merge pull request #1974 from matrix-org/t3chguy/warn_self_mute 
warn on self-mute
 2018-07-02 10:13:49 +01:00
David Baker
41082f448b
Merge pull request #1945 from matrix-org/t3chguy/click_username_state_ev 
make click to insert nick work on join/parts, /me's etc
 2018-07-02 10:12:40 +01:00
Luke Barnard
0dd3a77432 Track an event name when tracking a decryption failure 
Otherwise piwik will not agregate the failures correctly for all views.
 2018-07-02 09:45:32 +01:00
Michael Telatynski
1b003ca39f
gen-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-30 17:07:35 +01:00
Michael Telatynski
37a8e7f2e2
add setting to throw new RoomSubList hide behaviour behind an opt-in 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-30 17:07:28 +01:00
Michael Telatynski
ca83f1e8c8
allow RoomSubList to use old behaviour of not hiding even if empty 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-30 17:06:33 +01:00
Slavi Pantaleev
12ed25534a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-06-30 15:38:04 +00:00
Michael Telatynski
ea6e1b6f72
Merge branch 'develop' into t3chguy/warn_self_mute 2018-06-29 19:17:43 +01:00
Michael Telatynski
85a0736c78
update wording as per D4ve's feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 19:16:56 +01:00
Michael Telatynski
2c537a8dff
update styling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 15:28:36 +01:00
Michael Telatynski
36ace9dcb9
using map-i18n remap all changed %(...)s => <...> to keep i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 15:21:44 +01:00
Michael Telatynski
6021c3a634
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/click_username_state_ev 2018-06-29 14:56:18 +01:00
Michael Telatynski
dddf7991b9
create map-i18n to aid with transforming the i18n entries not to waste them 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 14:56:06 +01:00
Michael Telatynski
1d91469104
switch to <ClickableUsername> and use <a> over <span> 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 14:52:25 +01:00
Jeff Huang
e93171831c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1208 of 1208 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-06-29 13:14:54 +00:00
Weblate
00d6ac6c4b Merge remote-tracking branch 'origin/develop' into develop 2018-06-29 10:52:40 +00:00
David Baker
41dee71d38 Merge branch 'master' into develop 2018-06-29 11:52:20 +01:00