gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,652 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

5652 Commits

Author SHA1 Message Date
Weblate 43f1951f37 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:19:34 +00:00
Luke Barnard 1704a2fb9c Merge pull request #5409 from vector-im/luke/fix-privileged-group-ui-1 
Only show UI for adding rooms/users to groups to privileged users
 2017-10-24 11:19:30 +01:00
Luke Barnard 6a0ecfba7f Merge branch 'develop' into luke/fix-privileged-group-ui-1 2017-10-24 11:09:05 +01:00
Weblate 6e5ae0c664 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:03:49 +00:00
David Baker ff5fbd4863 Merge pull request #5407 from vector-im/luke/fix-invite-to-community 
Only show "Invite to this community" when viewing group members
 2017-10-24 11:03:44 +01:00
lub b5629ac3e6 fix comma error of features example 
Signed-off-by: Simon Körner <github@lubiland.de>
 2017-10-24 11:43:15 +02:00
Luke Barnard f1a700ef99 Only show UI for adding rooms/users to groups to privileged users 2017-10-24 10:38:40 +01:00
Luke Barnard cc1fb8ac94 Only show "Invite to this community" when viewing group members 2017-10-24 10:22:13 +01:00
Weblate d91c652590 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 16:11:26 +00:00
Richard Lewis 8672939f0c Merge pull request #5397 from vector-im/rxl881/deleteWidget 
Add trash can icon for delete widget
 2017-10-23 17:11:21 +01:00
Richard Lewis c8f89fbc9b Added delete widget icon. 2017-10-23 17:07:25 +01:00
Jan Kudrik 61e06d8cf3 Translated using Weblate (Czech) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-10-23 15:38:52 +00:00
Weblate e05ec68a61 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 13:55:46 +00:00
Matthew Hodgson c7d18ff52e improve flair cosmetics 2017-10-23 14:55:36 +01:00
Matthew Hodgson 508a850dec add features example to config.sample.json 2017-10-23 14:54:38 +01:00
Weblate ec12b8ee93 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 13:46:36 +00:00
Luke Barnard 0e20b20fb2 Fix CSS for room avatar "remove" icon 2017-10-23 14:46:28 +01:00
Weblate 052c00bd86 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 13:08:14 +00:00
Bamstam 146a75f7e7 Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-23 13:08:13 +00:00
Luke Barnard d9fa11d03a Fix MyGroups placeholder colours on dark theme 2017-10-23 14:08:02 +01:00
Michael Telatynski b16d4280b7
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:42:06 +01:00
Michael Telatynski eb45b00b32
fix bad tab completion 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:40:25 +01:00
Michael Telatynski 84d1f838f0
make filtering case-insensitive 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:39:21 +01:00
Jeff Huang 16cd69f7dd Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2017-10-23 01:09:22 +00:00
Matthew Hodgson 190811ac1c WIP 2017-10-23 00:57:02 +01:00
Matthew Hodgson 01b3d6128c move status theme into a dedicated dir, and make fonts work 2017-10-22 17:03:39 +01:00
Matthew Hodgson b28192cc0b fix (C) 2017-10-22 15:21:58 +01:00
Andrey 9d56f7e214 Translated using Weblate (Russian) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-10-20 19:35:53 +00:00
Matthew Hodgson cd31e6532b initial wip theme 2017-10-20 18:43:06 +01:00
Matthew Hodgson 6fa2d35630 support concept of default theme 2017-10-20 18:41:39 +01:00
Weblate 5898a972a8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-20 17:16:37 +00:00
Luke Barnard 14b5006645 Merge pull request #5375 from vector-im/luke/groups-my-groups-placeholder 
CSS to improve MyGroups in general, and add placeholder
 2017-10-20 18:16:33 +01:00
Luke Barnard 94454333d5 CSS to improve MyGroups in general, and add placeholder 2017-10-20 17:38:38 +01:00
Weblate b33998c1f9 Merge remote-tracking branch 'origin/develop' into develop 2017-10-20 16:11:26 +00:00
Richard Lewis 63bcca1c7d Merge pull request #4881 from vector-im/rxl881/parallelshell 
Rxl881/parallelshell
 2017-10-20 17:11:20 +01:00
Krombel 060b5d100f Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-20 15:35:27 +00:00
Szimszon 3e435e4581 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2017-10-20 13:51:09 +00:00
Weblate 95b5bcc6b0 Merge remote-tracking branch 'origin/develop' into develop 2017-10-20 13:03:53 +00:00
Krombel 25a7fb07a3 Translated using Weblate (German) 
Currently translated at 99.5% (214 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-20 13:03:52 +00:00
David Baker b72d35e0df Merge pull request #5371 from vector-im/dbkr/fix_custom_server_text 
Custom server text was i18ned by key
 2017-10-20 14:03:48 +01:00
David Baker 667556f3ce Custom server text was i18ned by key 
And therefore got replaced by the key by the i18n script
 2017-10-20 13:48:00 +01:00
Luke Barnard 483762cc35 Merge pull request #5370 from vector-im/dbkr/prunei18n_oct17 
Run prunei18n
 2017-10-20 11:56:48 +01:00
David Baker a76fdc750a Run prunei18n 2017-10-20 11:40:05 +01:00
David Baker 1f9b5b25cb Merge pull request #5369 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-10-20 11:31:51 +01:00
Weblate 0e3fbb6770 Merge branch 'develop' of https://github.com/vector-im/riot-web into develop 
Conflicts:
	src/i18n/strings/de_DE.json
	src/i18n/strings/hu.json
	src/i18n/strings/ru.json
	src/i18n/strings/zh_Hant.json
 2017-10-20 10:29:12 +00:00
Luke Barnard cc0a6d5c94 Merge pull request #5339 from vector-im/dbkr/prunei18n 
Add script to prune unused translations
 2017-10-20 11:21:57 +01:00
Richard Lewis 449af3c2e1 Update deps. 2017-10-20 10:27:59 +01:00
Richard Lewis 528a856d54 Add class to identify non-scalar widget instances 2017-10-20 09:46:45 +01:00
Richard Lewis b2288e6525 Fix deps. 2017-10-20 09:45:29 +01:00
Luke Barnard c6f75fbf37 Adjust CSS in MyGroups, justify-content:space-around 2017-10-19 18:08:52 +01:00