gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,044 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

5044 Commits

Author SHA1 Message Date
Luke Barnard 07a17829ea
Merge pull request #5472 from vector-im/t3chguy/fix_typecheck_warn 
Fix instanceof check, was checking against the Package rather than class
 2017-10-31 10:29:18 +00:00
Michael Telatynski c39044f397
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/fix_typecheck_warn 2017-10-30 15:27:20 +00:00
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 c74e6c3c0c Merge pull request #5455 from vector-im/luke/groups-fix-invite-button 
Use correct group store state when rendering "Invite to this community"
 2017-10-27 16:10:33 +01:00
Luke Barnard 3dcc397f67 Fix AuxPanel floating in the middle 
When there is no RoomView_body to push it to the top of the flex container
 2017-10-27 15:40:03 +01:00
Luke Barnard 7bae7fe9e5 Use correct group store state when rendering "Invite to this community" 
This required slight rework of how RightPanel uses the group store, and now it knows an unfortunate amount about the group store. Food for thought on stores in general, I think.
 2017-10-27 14:33:28 +01:00
Matthew Hodgson 3df1808fd0 Merge pull request #5453 from VickyKoblinski/es6-notifications 
Leverages ES6 in Notifications
 2017-10-27 09:15:22 +01:00
Vicky Koblinski d188fdb9fe Changes requires to imports for consistancy, removes 'use strict' 2017-10-26 21:23:16 -04:00
Vicky Koblinski 7588814ec5 Leverages ES6 and fixes typo 2017-10-26 20:37:15 -04:00
Luke Barnard 507cef3ba4 Merge pull request #5437 from vector-im/luke/feature-optionally-mirror-local-video 
Re-PR #4412
 2017-10-26 09:55:17 +01:00
Luke Barnard 044519f9ea Add more specific css class to allow for optional flipping 2017-10-25 18:18:37 +01:00
Luke Barnard 5db44bd4ae Merge branch 'develop' into TheLastProject-reverse-video 2017-10-25 18:06:16 +01:00
Luke Barnard bc3df74c2f Merge pull request #5410 from lub/patch-1 
fix comma error of features example
 2017-10-25 16:53:55 +01:00
Luke Barnard f6a920a018 Merge pull request #5387 from vector-im/t3chguy/devtools-filter-case-sens 
Devtools: make filtering case-insensitive
 2017-10-25 16:51:57 +01:00
Luke Barnard a627784c41 Merge pull request #5432 from vector-im/luke/fix-group-members-info-icon-highlight 
Highlight group members icon in group member info
 2017-10-25 15:41:09 +01:00
Luke Barnard 7c7ae3a31f Merge pull request #5422 from vector-im/luke/fix-interactable-greyed-ui 
Use CSS to stop greyed Right/LeftPanel UI from being interactable
 2017-10-25 15:30:38 +01:00
Luke Barnard cd0888ce5a Highlight group members icon in group member info 2017-10-25 15:27:50 +01:00
Luke Barnard 9679051269 Introduce mx_RoomView_body for fadable things in the RoomView 
Part of simplifying use of mx_fadable
 2017-10-25 15:16:28 +01:00
Luke Barnard 0561c5bd4f Swap ui_opacity for panel_disabled 
Simplify the API for disabling panels in the UI. `mx_fadable_faded` is applied instead of setting opacity.
 2017-10-25 10:29:57 +01:00
Luke Barnard a747a78e06 CSS to allow multi-line "Add rooms to this community" 2017-10-24 17:48:06 +01:00
Luke Barnard bd15a88c89 Use CSS to stop greyed Right/LeftPanel UI from being interactable 2017-10-24 17:10:29 +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
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
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
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
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