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

5434 Commits

Author SHA1 Message Date
Luke Barnard 67bc346ebb Add CSS for CreateGroupDialog to give group ID input suffix and prefix style 2017-11-03 15:39:24 +00:00
Matthew Hodgson 923295973b Merge branch 'develop' into matthew/status 2017-11-03 15:11:23 +00:00
Weblate 8518e2b056 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 14:40:10 +00:00
Luke Barnard 04c866ce9c Fix #5359 - unbreakable topics not breaking 
The room directory CSS has `word-break: break-word` applied to the entire mx_RoomDirectory, which is questionable. For now, add the same rule to RoomDetailList
 2017-11-03 14:39:24 +00:00
Weblate f59ea648f0 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 14:11:16 +00:00
Luke Barnard 3192c345be rethemedex 
Needed, having removed _GroupInviteTile.scss
 2017-11-03 14:11:07 +00:00
Weblate 6432792d86 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 13:54:01 +00:00
Luke Barnard 22b82182a7
Merge pull request #5504 from vector-im/luke/fix-groups-invites-appearance 
Fix group invites such that they look similar to room invites
 2017-11-03 13:53:56 +00:00
Luke Barnard c60ff5d283 Fix group invites such that they look similar to room invites 
- Remove CSS for GroupInviteTile - the component should be using RoomTile CSS
 - Added extra tiles to roomCount of RoomSubList header

Part of fixing https://github.com/vector-im/riot-web/issues/5226
 2017-11-03 12:17:49 +00:00
Weblate a3d15e05b1 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 12:03:16 +00:00
Luke Barnard 2c4c6e82bb
Merge pull request #5501 from vector-im/luke/groups-fix-my-groups-layout 
CSS for Your Communities scrollbar
 2017-11-03 12:03:10 +00:00
Luke Barnard 4d11e739b5 Comment 0px height and margin on joinBox 2017-11-03 11:42:06 +00:00
Luke Barnard f6974407e3 CSS for Your Communities scrollbar 
and also attempt to fix GroupTile flex weirdness.
 2017-11-03 11:22:29 +00:00
Weblate 61287b5f08 Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 15:37:58 +00:00
David Baker 69a82f7859
Merge pull request #5497 from vector-im/luke/groups-room-info 
Add toggle to alter visibility of room-group association
 2017-11-02 15:37:52 +00:00
Luke Barnard ee71c72685 Use margin to separate "perms" in the room directory 
instead of a space.
 2017-11-02 15:13:55 +00:00
Luke Barnard 06ce467876 Add CSS for group room visibility label alignment 2017-11-02 15:05:08 +00:00
Luke Barnard c01ea56676 Add toggle to alter visibility of room-group association 2017-11-02 13:40:07 +00:00
Weblate ac89b5dc5e Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 12:53:34 +00:00
Luke Barnard fb8e41a9c1
Merge pull request #5494 from vector-im/dbkr/pillify_at_room 
CSS for room notification pills
 2017-11-02 12:53:29 +00:00
Weblate 7ab3be0a11 Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 11:07:06 +00:00
David Baker 2e8f960ee3
Merge pull request #5493 from vector-im/luke/groups-room-info 
Implement simple GroupRoomInfo
 2017-11-02 11:07:00 +00:00
David Baker 65ea7a8460 Use more spercific selector instead of !important 2017-11-02 10:37:25 +00:00
Kévin C 819122c111 Translated using Weblate (French) 
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/fr/
 2017-11-01 20:04:22 +00:00
David Baker cd84d86fd1 CSS for room notification pills 2017-11-01 19:45:59 +00:00
Luke Barnard 2163a54617 Implement simple GroupRoomInfo 
See matrix-org/matrix-react-sdk#1563
 2017-11-01 17:32:01 +00:00
Matthew Hodgson 8ef3811f28 Merge branch 'develop' into matthew/status 2017-11-01 15:25:50 +00:00
Matthew Hodgson 8f289519e1 fix chevron cosmetics 2017-11-01 15:25:23 +00:00
Matthew Hodgson df58bdd529 use absolute url for og:image 2017-10-31 22:56:57 +00:00
Matthew Hodgson 1b7e42f5e8 add og:image 2017-10-31 22:45:19 +00:00
Weblate 62d249442e Merge remote-tracking branch 'origin/develop' into develop 2017-10-31 18:02:38 +00:00
Kévin C 007ff8d177 Translated using Weblate (French) 
Currently translated at 96.2% (207 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-10-31 18:02:37 +00:00
Richard Lewis 56c6a15ddf
Merge pull request #5458 from vector-im/rxl881/widgetTitleBorder 
Add back bottom border to widget title bar
 2017-10-31 18:02:32 +00:00
Richard Lewis 04d1a72307 Undo comitted changes to package-lock.json 2017-10-31 18:02:04 +00:00
Weblate ea785aa888 Merge remote-tracking branch 'origin/develop' into develop 2017-10-31 13:52:25 +00:00
David Baker 841503f907
Merge pull request #5478 from vector-im/luke/css-header-name-clickable-for-members 
Prevent group name looking clickable for non-members
 2017-10-31 13:52:19 +00:00
Luke Barnard ba1ad84d59 Prevent group name looking clickable for non-members 2017-10-31 10:56:14 +00:00
Weblate 1ffa7ae906 Merge remote-tracking branch 'origin/develop' into develop 2017-10-31 10:29:24 +00:00
Walter 2d69595beb Translated using Weblate (Ukrainian) 
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/uk/
 2017-10-31 10:29:24 +00:00
Enrico Bacis cd6a3d2293 Translated using Weblate (Italian) 
Currently translated at 96.7% (208 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2017-10-31 10:29:23 +00:00
Bamstam d86841c1c8 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-31 10:29:23 +00:00
grrgui 58b9b04e35 Translated using Weblate (French) 
Currently translated at 96.2% (207 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-10-31 10:29:23 +00:00
Jan Kudrik 71fc072301 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-31 10:29:22 +00:00
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
Michael Telatynski 6da2f88dc5
Devtools styling tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 13:32:31 +00:00
Michael Telatynski ea9b630082
Refactor and add Account Data stuffs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 12:44:50 +00:00
Travis Ralston f1c81be633 Import the right SettingsStore 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 22:18:34 -06:00
Travis Ralston ccf52b2a69 Convert local settings to granular settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 17:05:27 -06:00