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

6456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
d05b221a6c Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 22:03:03 +00:00
Ralitsa Bozhkova
54f4563303 Translated using Weblate (Bulgarian) 
Currently translated at 14.3% (32 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-13 22:03:02 +00:00
Matthew Hodgson
7aea7f9400
Merge pull request #6134 from vector-im/luke/fix-tag-panel-collapse 
Fix TagPanel from collapsing to < 60px when LP collapsed
 2018-02-13 22:02:58 +00:00
Matthew Hodgson
9abda76d9e
Merge branch 'develop' into luke/fix-tag-panel-collapse 2018-02-13 22:02:49 +00:00
Weblate
42582c7ccd Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 20:45:44 +00:00
Simó Albert i Beltran
c88a59c228 Translated using Weblate (Spanish) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-02-13 20:45:44 +00:00
Ralitsa Bozhkova
b54f949fe6 Translated using Weblate (Bulgarian) 
Currently translated at 13.4% (30 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-13 20:45:43 +00:00
Richard Lewis
a966cc7dec
Merge pull request #6138 from vector-im/rxl881/llpFix 
Temporary hack to constrain LLP container size.
 2018-02-13 20:45:39 +00:00
Richard Lewis
55cacfba82 Temporary hack to constrain LLP container size. 2018-02-13 20:42:46 +00:00
Walter
3bc1eef39b Translated using Weblate (Russian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2018-02-13 18:56:54 +00:00
Simó Albert i Beltran
ee7add05ae Translated using Weblate (Catalan) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-02-13 18:46:42 +00:00
Kévin C
e7d1c04bb5 Translated using Weblate (French) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2018-02-13 18:25:15 +00:00
Simó Albert i Beltran
247a3cebb9 Translated using Weblate (Spanish) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-02-13 18:00:42 +00:00
Weblate
5bf0b7d652 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 17:32:54 +00:00
Matthew Hodgson
0b5fe1232f
Merge pull request #6137 from rbozhkova/patch-1 
Fix typo
 2018-02-13 17:32:50 +00:00
Weblate
03be7eb32c Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 17:28:52 +00:00
Luke Barnard
3a808411f5
Merge pull request #6127 from vector-im/luke/feature-tag-panel-tile-context-menu 
Add context menu to TagPanel
 2018-02-13 17:28:47 +00:00
Ralitsa Bozhkova
2524c5f861 Added translation using Weblate (Bulgarian) 2018-02-13 17:22:45 +00:00
rbozhkova
db5f4193ec
Fix typo 2018-02-13 18:22:01 +01:00
Luke Barnard
11b0cc8211 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu 2018-02-13 17:00:19 +00:00
Luke Barnard
285c4f91d3 Fix TagPanel from collapsing to < 60px when LP collapsed 
Fixes https://github.com/vector-im/riot-web/issues/6133
 2018-02-13 15:17:51 +00:00
Weblate
084ebe6e16 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 14:18:56 +00:00
David Baker
e67147213b
Merge pull request #6096 from vector-im/luke/room-list-flux 
Make room tagging flux-y
 2018-02-13 14:18:50 +00:00
Luke Barnard
85c0b8dea3 Adjust CSS to prevent scrollbars on message panel spinner 
when clicking on permalinks/jump to first
 2018-02-13 14:15:22 +00:00
Weblate
aec3c9961c Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 10:00:58 +00:00
Oskars
c7aafd8410 Translated using Weblate (Latvian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/
 2018-02-13 10:00:57 +00:00
lighthawk
c0720d5d24 Translated using Weblate (Japanese) 
Currently translated at 33.3% (74 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
 2018-02-13 10:00:57 +00:00
David Baker
ec0dd63470
Merge pull request #6130 from vector-im/luke/move-groups-button-tp 
Move groups button to TagPanel
 2018-02-13 11:00:53 +01:00
Luke Barnard
2269c94579 Move groups button to TagPanel 2018-02-13 09:44:25 +00:00
Luke Barnard
e36baa8c3a Fix quotes on import 2018-02-12 18:47:29 +00:00
Luke Barnard
d47c9d8b6e Add context menu to TagPanel 
See https://github.com/matrix-org/matrix-react-sdk/pull/1743
 2018-02-12 18:02:55 +00:00
Oskars
93a381218c Translated using Weblate (Latvian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/
 2018-02-10 12:34:50 +00:00
Richard Lewis
095130a569 Hide apps drawer 2018-02-09 13:23:56 +00:00
Weblate
5472dc78d7 Merge remote-tracking branch 'origin/develop' into develop 2018-02-09 12:46:37 +00:00
David Baker
1d2f5bafda Merge branch 'master' into develop 2018-02-09 12:46:28 +00:00
David Baker
9e614a54da v0.13.5 2018-02-09 12:43:45 +00:00
David Baker
30087e5c73 Prepare changelog for v0.13.5 2018-02-09 12:43:45 +00:00
David Baker
1d222e3507 v0.13.5 2018-02-09 12:38:23 +00:00
David Baker
b20dea58c6 Bump react-sdk version 2018-02-09 12:36:19 +00:00
Weblate
47df5d2d60 Merge remote-tracking branch 'origin/develop' into develop 2018-02-09 12:28:42 +00:00
Osoitz
d3c1072842 Translated using Weblate (Basque) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2018-02-09 12:28:40 +00:00
David Baker
d904212033 Merge branch 'release-v0.13.5' into develop 2018-02-09 12:28:26 +00:00
David Baker
62e90ceb0d Sanity check URLs with isUrlPermitted 
Thanks to walle303 for letting us know these weren't being checked.
 2018-02-09 12:20:31 +00:00
Luke Barnard
0cdebcce89 Move sublist sorting to RoomListStore 
NB: fixUndefinedOrdering was removed completely because it was
code dealing with legacy favourites.

see matrix-org/matrix-react-sdk@9b0df191
 2018-02-08 16:28:42 +00:00
Luke Barnard
495090c9ba Remove now unused RoomSubList code 2018-02-08 14:08:20 +00:00
Марко М. Костић
f41a70fe1f Translated using Weblate (Serbian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
 2018-02-07 20:36:40 +00:00
Weblate
bdbf0427a1 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 18:03:48 +00:00
Matthew Hodgson
d484a1cd85
Merge pull request #6106 from vector-im/luke/fix-long-group-name 
Fix long group name pushing settings cog into void
 2018-02-07 18:03:43 +00:00
lukebarnard
4b7561a75e Fix long group name pushing settings cog into void 2018-02-07 17:40:00 +00:00
Simó Albert i Beltran
31af7c583f Translated using Weblate (Spanish) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-02-07 13:57:00 +00:00