8af90b052b
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 10:04:44 +00:00
60de1dbffb
Merge pull request #5546 from vector-im/luke/groups-add-rooms-with-visibility
...
CSS for adding rooms to a group with visibility
2017-11-08 10:04:38 +00:00
38b5b27aa9
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:52:43 +00:00
c7dba61d92
Merge pull request #5511 from turt2live/travis/more-pinned-css
...
CSS for pinned indicators
2017-11-07 18:52:39 +00:00
26d9677bbe
CSS for adding rooms to a group with visibility
...
Also, make chat invite error looks slightly more normal
2017-11-07 18:49:28 +00:00
beddf3a2cb
Get rid of accidental merge stuff
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 11:05:29 -07:00
144cbd144e
Merge branch 'develop' into travis/more-pinned-css
2017-11-07 11:04:22 -07:00
1bdc666197
Adjust CSS for GroupView
...
Part of showing the group inviter profile: https://github.com/matrix-org/matrix-react-sdk/pull/1585
2017-11-07 16:43:02 +00:00
a72cc77e24
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 15:54:51 +00:00
4c22f9a549
Translated using Weblate (German)
...
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/de/
2017-11-07 15:54:50 +00:00
f280fe3c66
Merge pull request #5540 from vector-im/luke/group-rooms-tooltip
...
Implement general-purpose tooltip "(?)"-style
2017-11-07 15:54:46 +00:00
4c0e956cc1
Name things in a sane way
2017-11-07 15:13:17 +00:00
e1d16acddb
Implement general-purpose tooltip "(?)"-style
2017-11-07 14:09:04 +00:00
a45ae588e5
Translated using Weblate (German)
...
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/de/
2017-11-07 13:34:54 +00:00
c8edaf1ba9
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 10:44:07 +00:00
9ff1fe8a72
Merge pull request #5535 from vector-im/luke/groups-new-group-settings
...
CSS for improving group creation UX, namely setting long description
2017-11-07 10:43:59 +00:00
aa4feb0563
Info plinth CSS variables
2017-11-06 18:57:08 +00:00
d87d6cbc64
CSS for improving group creation UX, namely setting long description
2017-11-06 18:38:47 +00:00
3633f55e20
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 15:49:46 +00:00
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
e1eba559fe
CSS for room notif pills in composer
2017-11-06 15:12:28 +00:00
01401fe4f8
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 14:10:32 +00:00
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
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
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
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
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
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
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
5a1498dec3
CSS for pinned indicators
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 20:01:54 -06:00
441aa91831
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 23:10:35 +00:00
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
f290569487
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 23:10:05 +00:00
c0b343c89f
Merge pull request #5471 from vector-im/t3chguy/devtools-1
...
T3chguy/devtools 1
2017-11-03 23:10:00 +00:00
a42414eabd
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 22:44:46 +00:00
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
038b3ed1eb
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 16:14:59 +00:00
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
290a501523
Use prefixed class names to avoid collisions with other libraries
2017-11-03 16:02:25 +00:00
67bc346ebb
Add CSS for CreateGroupDialog to give group ID input suffix and prefix style
2017-11-03 15:39:24 +00:00
8518e2b056
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 14:40:10 +00:00
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
f59ea648f0
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 14:11:16 +00:00
3192c345be
rethemedex
...
Needed, having removed _GroupInviteTile.scss
2017-11-03 14:11:07 +00:00
6432792d86
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 13:54:01 +00:00
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
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
a3d15e05b1
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 12:03:16 +00:00
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
4d11e739b5
Comment 0px height and margin on joinBox
2017-11-03 11:42:06 +00:00
Weblate