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

5412 Commits

Author SHA1 Message Date
Luke Barnard 718f48ba04 Merge branch 'develop' into release-v0.13.0 2017-11-10 16:50:11 +00:00
Luke Barnard 73e7581fc6
Merge pull request #5566 from vector-im/luke/groups-enable 
Make groups a fully-fleged baked-in feature
 2017-11-10 16:24:19 +00:00
Richard Lewis 83373bcf6e Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/visualCue 2017-11-10 16:22:33 +00:00
Richard Lewis 29abb5eed0 Center mixed content warnings in panel. 2017-11-10 16:15:31 +00:00
Luke Barnard 277a6dee10 Make groups a fully-fleged baked-in feature 2017-11-10 15:38:50 +00:00
Luke Barnard 5c9dd17d21 v0.13.0-rc.1 2017-11-10 13:44:55 +00:00
Luke Barnard b494b458bb Prepare changelog for v0.13.0-rc.1 2017-11-10 13:44:55 +00:00
Luke Barnard 0630d856f8 v0.13.0-rc.1 2017-11-10 13:44:08 +00:00
Luke Barnard 1008ede4d1 Bump matrix-react/js-sdk deps 2017-11-10 13:42:31 +00:00
Richard Lewis cf1beb1d94 Fix right marign. 2017-11-10 00:16:41 +00:00
Richard Lewis d0fe0499aa
Merge pull request #5561 from vector-im/rxl881/widgetStyling 
Fix app tile margins.
 2017-11-09 23:56:08 +00:00
Richard Lewis bfa4f59f3d Lint space. 2017-11-09 22:47:23 +00:00
Richard Lewis 63f520b5ee Fix app tile margins. 2017-11-09 22:45:35 +00:00
Luke Barnard a0b0b6f053
Merge pull request #5549 from vector-im/rxl881/roomTopic 
Fix wrapping of long room topics (and overlap with apps)
 2017-11-09 17:40:55 +00:00
Luke Barnard 88cd46bfcf
Merge pull request #5555 from vector-im/rxl881/widgetrendering 
Don't display widget iframes whilst loading.
 2017-11-09 17:36:56 +00:00
Luke Barnard 7094df900a
Merge pull request #5558 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-11-09 17:01:21 +00:00
Peter Vágner 1f524f3085 Translated using Weblate (Slovak) 
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/sk/
 2017-11-09 16:49:31 +00:00
bldrzzy 405504dca4 Translated using Weblate (Polish) 
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/pl/
 2017-11-09 16:49:31 +00:00
Marek Suchánek 2bb13fba7e Translated using Weblate (Czech) 
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/cs/
 2017-11-09 15:53:39 +00:00
Richard Lewis d45940f204 Don't display widget iframes whilst loading. 2017-11-09 10:02:00 +00:00
Xose M 81b085fbb8 Translated using Weblate (Galician) 
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/gl/
 2017-11-09 06:21:33 +00:00
Jeff Huang 910a5f7e6c Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2017-11-08 22:56:35 +00:00
Richard Lewis 092ec1cc6c Prevent long topics from overflowing fixed height header. 2017-11-08 20:03:35 +00:00
Richard Lewis 106430f7b6 Move margin to AppTile elements so that it is only present with app tiles. 
Comment unused classes.
 2017-11-08 19:48:53 +00:00
Richard Lewis 76570a0f14 Make long topics overflow in to a second, hidden column. 2017-11-08 17:02:17 +00:00
Richard Lewis e7fbad2236 Increase height to avoid content from overflowing (mx_RoomHeader_name.height + mx_RoomHeader_topic.max-height) 2017-11-08 16:44:45 +00:00
Matthew Hodgson 2fa1f16284 use new theme-aware tinter api 2017-11-08 06:55:30 -08:00
Matthew Hodgson d4128af224 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-08 04:29:44 -08:00
Peter Vágner e90419e40d Translated using Weblate (Slovak) 
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/sk/
 2017-11-08 12:11:57 +00:00
Peter Vágner 16991a8f68 Added translation using Weblate (Slovak) 2017-11-08 12:10:20 +00:00
Weblate b788e759da Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 10:24:01 +00:00
Luke Barnard 3ee45b21b8
Merge pull request #5543 from vector-im/luke/groups-inviter-profile 
Adjust CSS for GroupView
 2017-11-08 10:23:57 +00:00
Weblate 8af90b052b Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 10:04:44 +00:00
Luke Barnard 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
Weblate 38b5b27aa9 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 18:52:43 +00:00
Matthew Hodgson c7dba61d92
Merge pull request #5511 from turt2live/travis/more-pinned-css 
CSS for pinned indicators
 2017-11-07 18:52:39 +00:00
Luke Barnard 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
Travis Ralston beddf3a2cb
Get rid of accidental merge stuff 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-07 11:05:29 -07:00
Travis Ralston 144cbd144e
Merge branch 'develop' into travis/more-pinned-css 2017-11-07 11:04:22 -07:00
Luke Barnard 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
Weblate a72cc77e24 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 15:54:51 +00:00
Krombel 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
Luke Barnard 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
Luke Barnard 4c0e956cc1 Name things in a sane way 2017-11-07 15:13:17 +00:00
Luke Barnard e1d16acddb Implement general-purpose tooltip "(?)"-style 2017-11-07 14:09:04 +00:00
Krombel 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
Weblate c8edaf1ba9 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 10:44:07 +00:00
Matthew Hodgson 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
Luke Barnard aa4feb0563 Info plinth CSS variables 2017-11-06 18:57:08 +00:00
Luke Barnard d87d6cbc64 CSS for improving group creation UX, namely setting long description 2017-11-06 18:38:47 +00:00