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

5020 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
71c8dca91a
Fix instanceof check, was checking against the Package rather than class 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 15:12:03 +00:00
Luke Barnard
a747a78e06 CSS to allow multi-line "Add rooms to this community" 2017-10-24 17:48:06 +01:00
Luke Barnard
858e1fa341 Fix #5361 
Make it possible to click on the camera icon under group icon
 2017-10-24 17:00:57 +01:00
David Baker
f258b3253f Merge pull request #5417 from vector-im/luke/groups-settings-privileged-only 
CSS for preventing editing of UI requiring user privilege if user unprivileged
 2017-10-24 15:51:07 +01:00
Luke Barnard
01d6577abd CSS for preventing editing of UI requiring user privilege if user unprivileged 2017-10-24 15:27:11 +01: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
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
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
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
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
Luke Barnard
0e20b20fb2 Fix CSS for room avatar "remove" icon 2017-10-23 14:46:28 +01:00
Luke Barnard
d9fa11d03a Fix MyGroups placeholder colours on dark theme 2017-10-23 14:08:02 +01: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
Richard Lewis
63bcca1c7d Merge pull request #4881 from vector-im/rxl881/parallelshell 
Rxl881/parallelshell
 2017-10-20 17:11:20 +01: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
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
Szimszon
7369719492 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-19 16:41:38 +00:00
Luke Barnard
62fd98245d Merge pull request #5360 from vector-im/luke/groups-my-groups 
CSS for improved MyGroups page
 2017-10-19 17:41:34 +01:00
Luke Barnard
8317bcbb9f CSS for improved MyGroups page 2017-10-19 17:27:21 +01:00
David Baker
b2e9b36978 Merge pull request #5346 from vector-im/dbkr/dialog_pad_right 
Add padding-right to Dialogs
 2017-10-19 16:19:40 +01:00
David Baker
ea459c84ba Other dialog subclasses have padding-right 2017-10-19 15:48:56 +01:00
David Baker
86226bc22d Add padding-right to Dialogs 
The "groups will be public" warning was apparently the first thing
long enough to reach the right hand edge
 2017-10-19 15:32:28 +01:00
Luke Barnard
289743c5fe Merge pull request #5344 from vector-im/dbkr/error_warning_color 
Add div.warning and use the scss var
 2017-10-19 15:31:03 +01:00
Luke Barnard
acb678afbd Merge pull request #5343 from vector-im/luke/groups-are-communities 
Groups->Communities
 2017-10-19 15:30:39 +01:00
David Baker
42ca840fef Add div.warning and use the scss var 
rather than the css color name
 2017-10-19 15:17:09 +01:00
David Baker
fc87fd2bb4 Merge pull request #5342 from vector-im/dbkr/add_rooms_button_no_swallow_clicks 
Make the 'add rooms' button clickable
 2017-10-19 15:07:52 +01:00
Luke Barnard
e5df06b2ab Groups->Communities 2017-10-19 15:07:22 +01:00
David Baker
9d8b59e082 Make the 'add rooms' button clickable 
SVG was swallowing pointer events
 2017-10-19 14:54:56 +01:00
Bamstam
7395d866f6 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-19 13:40:12 +00:00
Matthew Hodgson
c4de42c6af switch back to tint-friendly luke room icons 2017-10-19 15:40:00 +02:00
David Baker
00f902cab1 Add script to prune unused translations 2017-10-19 12:11:53 +01:00
Luke Barnard
ae9263fa59 Merge pull request #5338 from vector-im/dbkr/i18n_script 
Switch to gen-i18n script
 2017-10-19 11:25:40 +01:00
David Baker
f712804018 Add note about it apparently segfaulting on node 6 2017-10-19 11:13:42 +01:00
David Baker
4e31aea402 Switch to gen-i18n script 2017-10-19 10:53:02 +01:00
Richard Lewis
568cd0aac6 Update parallelshell to ^3.02 2017-10-19 10:12:00 +01:00
Richard Lewis
ae3229b40c Add package-lock.json to VC 2017-10-19 10:11:33 +01:00
Krombel
987072b25a 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-19 09:08:54 +00:00