PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
8677 commits 1 branch 0 tags 338 MiB
Commit graph

8677 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
4490715b60
Merge branch 'develop' into t3chguy/rich_quoting_linear 2018-01-22 16:46:20 +00:00
Michael Telatynski
a6cefb83f8
basic error handling for malformed quotes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 16:41:32 +00:00
Michael Telatynski
3b1d69edbb
Change Quotes to be linearly rendered rather than recursively nested 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 16:34:47 +00:00
Michael Telatynski
33995b053e
Add class to EventTile Line's that are quotes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 16:34:14 +00:00
Andrey
34b9db2033 Translated using Weblate (Russian) 
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-22 16:03:49 +00:00
Michael Telatynski
37dcb33b15
Reset quotingEvent on Room Change because inideal UX 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 14:45:04 +00:00
Weblate
066d1a0ed2 Merge remote-tracking branch 'origin/develop' into develop 2018-01-22 11:16:48 +00:00
pebles
8496c947c8 Translated using Weblate (Spanish) 
Currently translated at 58.3% (573 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-01-22 11:16:48 +00:00
Марко М. Костић
1d43ccde23 Translated using Weblate (Serbian) 
Currently translated at 28.0% (275 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-01-22 11:16:48 +00:00
A.G
2326ee2586 Translated using Weblate (Italian) 
Currently translated at 9.1% (90 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-01-22 11:16:47 +00:00
Szimszon
755ead7c1d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-01-22 11:16:47 +00:00
Matthew Hodgson
02824cfacf fix i18n for show devices prompt 2018-01-22 12:16:11 +01:00
Osoitz
fb9930ad2c Translated using Weblate (Basque) 
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-21 09:31:40 +00:00
Jeff Huang
fd2ef3e54d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-01-21 00:11:52 +00:00
Andrey
2111271bda Translated using Weblate (Russian) 
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-20 15:41:41 +00:00
Peter Vágner
a0ba25806c Translated using Weblate (Slovak) 
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-01-20 15:13:54 +00:00
Kévin C
1356e6dfd2 Translated using Weblate (French) 
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-01-20 14:49:56 +00:00
Szimszon
38c58f3b23 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-01-20 13:40:43 +00:00
Michael Telatynski
61b3d050ab Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/group_create_dialog_fixes 2018-01-20 13:39:57 +00:00
Michael Telatynski
2705397bf6 Add local GID==='' check, because Synapse says Group rather than Community 
Reset createError when doing check because it is now stale

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-20 13:16:33 +00:00
Weblate
da5cf63daf Merge remote-tracking branch 'origin/develop' into develop 2018-01-20 11:44:21 +00:00
Марко М. Костић
67a4c6c487 Translated using Weblate (Serbian) 
Currently translated at 18.2% (179 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-01-20 11:44:21 +00:00
Matthew Hodgson
5125683041
Merge pull request #1713 from Half-Shot/hs/leave-room-warnings 
Show a warning if the user attempts to leave a room that is invite only
 2018-01-20 11:44:15 +00:00
Will Hunt
5206c9d18b Show a warning if the user attempts to leave a room that is invite only 2018-01-19 22:52:43 +00:00
David Baker
86e8334248 Try upgrading eslint-plugin-react 
Because 7.4.0 does not seem to be picking up the same set of
problems as 7.5.1
 2018-01-19 18:04:42 +00:00
Weblate
aff1fcde90 Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 14:49:55 +00:00
Luke Barnard
a8320fe7e2
Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd 
Swap RoomList to react-beautiful-dnd
 2018-01-19 14:49:49 +00:00
lukebarnard
6106b3ce44 newOrder defaults null, allows check for newOrder on line 357 2018-01-19 14:12:27 +00:00
lukebarnard
54f6d305d7 Null-guard for newTag 2018-01-19 14:11:05 +00:00
Weblate
e4b4a885ff Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 14:07:23 +00:00
lukebarnard
75a1922731 Fix linting 2018-01-19 14:07:13 +00:00
lukebarnard
00dc077271 Remove react-dnd, revert fa14bc9 as no longer needed 2018-01-19 13:34:56 +00:00
Weblate
533e5482d8 Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 10:39:51 +00:00
Марко М. Костић
fba5d33923 Translated using Weblate (Serbian) 
Currently translated at 12.0% (118 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-01-19 10:39:50 +00:00
Matthew Hodgson
6c15bd8599 fix NPE when getGroupProfiles returns null 2018-01-19 10:39:38 +00:00
lukebarnard
6f0d799912 Fix indentation 2018-01-18 18:15:34 +00:00
lukebarnard
59f4661bfd Add comment 2018-01-18 18:01:31 +00:00
lukebarnard
dfecad181a Swap RoomList to react-beautiful-dnd 2018-01-18 17:59:29 +00:00
Weblate
5adbedb28a Merge remote-tracking branch 'origin/develop' into develop 2018-01-18 10:22:26 +00:00
David Baker
c090c2e7df
Merge pull request #1710 from matrix-org/t3chguy/roomColor 
don't pass back {} when we have no `org.matrix.room.color_scheme`
 2018-01-18 10:22:21 +00:00
Weblate
5fd7c30dbf Merge remote-tracking branch 'origin/develop' into develop 2018-01-18 09:57:38 +00:00
Matthew Hodgson
80d3edfbb3 simplify the 'send anyway' text, as 'mark devices known' is meaningless to users 2018-01-18 09:57:29 +00:00
Weblate
9e987337b7 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 23:28:22 +00:00
Matthew Hodgson
d3292d9388 fix typos and NPE. fixes #5999 2018-01-17 23:28:14 +00:00
Weblate
0fb808ef99 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 19:28:56 +00:00
David Baker
27b27e3759
Merge pull request #1700 from matrix-org/dbkr/dont_paginate_while_decrypting 
Don't paginate whilst decrypting events
 2018-01-17 19:28:52 +00:00
Weblate
d93518ac43 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 19:28:43 +00:00
David Baker
6b43b412ab
Merge pull request #1699 from matrix-org/dbkr/i18n_plural_fallback 
Fall back for missing i18n plurals
 2018-01-17 19:28:38 +00:00
Michael Telatynski
2f42e69b57 Merge branches 'develop' and 't3chguy/roomColor' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomColor 2018-01-17 18:20:35 +00:00
Michael Telatynski
b7204e79a7 fallback after receiving settings rather than {} because its truthy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:17:26 +00:00