OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,359 Commits
186 Branches
526 Tags
362 MiB
Commit Graph

5359 Commits (2a402985aad93396298e7ea0f928992666fe7d0c)

Author SHA1 Message Date
Luke Barnard a8bdde9f55
Merge pull request #5531 from vector-im/dbkr/composer_at_room_pills 
CSS for room notif pills in composer
 2017-11-06 15:49:41 +00:00
David Baker e1eba559fe CSS for room notif pills in composer 2017-11-06 15:12:28 +00:00
Weblate 01401fe4f8 Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 14:10:32 +00:00
Walter ba1ab9bdd1 Translated using Weblate (Ukrainian) 
Currently translated at 99.5% (216 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
 2017-11-06 14:10:32 +00:00
Bamstam 25782404d4 Translated using Weblate (German) 
Currently translated at 98.6% (214 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-11-06 14:10:32 +00:00
David Baker a1512af9f9
Merge pull request #5520 from vector-im/luke/right-panel-no-group 
Do not init a group store when no groupId specified
 2017-11-06 14:10:27 +00:00
Luke Barnard cd26f63315 Do not init a group store when no groupId specified 
(in RightPanel), otherwise the store will happily send requests to the server for the `undefined` group.
 2017-11-06 10:16:03 +00:00
Szimszon 68bb61d281 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2017-11-05 18:49:35 +00:00
Travis Ralston 63607f29e7 Use SettingsStore for notification settings 
Signed-off-by: Travis Ralstron <travpc@gmail.com>
 2017-11-04 22:27:34 -07:00
Matthew Hodgson d14285eb08 fix secondary accent color tinting 2017-11-05 02:20:12 +00:00
Matthew Hodgson 555847e5e9 make default theme actually work 2017-11-05 00:40:13 +00:00
Matthew Hodgson 816042d3a8 Merge branch 'develop' into matthew/status 2017-11-04 23:51:20 +00:00
Matthew Hodgson 9a0bbfb871 tint the colours in the theme rather than hardcode vector green 2017-11-04 23:43:34 +00:00
Matthew Hodgson adedf23cfb remove unnamespaced CSS fail 2017-11-04 22:19:06 +00:00
Andrey b4b4fefffb Translated using Weblate (Russian) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-11-04 08:11:22 +00:00
Kévin C 2b49b68ba5 Translated using Weblate (French) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-11-04 07:26:28 +00:00
Travis Ralston 69939e2fe3 Merge branch 'develop' into travis/granular 2017-11-03 21:56:46 -06:00
Travis Ralston 5a1498dec3 CSS for pinned indicators 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-03 20:01:54 -06:00
Weblate 441aa91831 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 23:10:35 +00:00
Matthew Hodgson 31c5122fa6
Merge pull request #5293 from turt2live/travis/pinned-led-css 
CSS for new pinned events indicator
 2017-11-03 23:10:31 +00:00
Weblate f290569487 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 23:10:05 +00:00
Matthew Hodgson c0b343c89f
Merge pull request #5471 from vector-im/t3chguy/devtools-1 
T3chguy/devtools 1
 2017-11-03 23:10:00 +00:00
Weblate a42414eabd Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 22:44:46 +00:00
Matthew Hodgson c90834114b
Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms 
Use margin to separate "perms" in the room directory
 2017-11-03 22:44:41 +00:00
Weblate 038b3ed1eb Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 16:14:59 +00:00
Luke Barnard 5d9a1b42a6
Merge pull request #5505 from vector-im/luke/groups-add-style-to-create-group-dialog 
Add CSS for CreateGroupDialog to give group ID input suffix and prefix style
 2017-11-03 16:14:54 +00:00
Luke Barnard 290a501523 Use prefixed class names to avoid collisions with other libraries 2017-11-03 16:02:25 +00:00
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