Commit Graph

5289 Commits

Author SHA1 Message Date
Bamstam
8bd66b93c5 Translated using Weblate (German)
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-11-15 00:22:35 +00:00
Weblate
b254ee4190 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 23:53:31 +00:00
Matthew Hodgson
3e72d8d969
Merge pull request #5286 from turt2live/travis/presence
CSS/components for custom presence controls
2017-11-14 23:53:26 +00:00
Weblate
c8dd31ba28 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 19:33:42 +00:00
Richard Lewis
aceabd6d28
Merge pull request #5574 from vector-im/rxl881/appTileStyling
Set widget tile background colour
2017-11-14 19:33:37 +00:00
Richard Lewis
81ef9b143c Add widget menubar styling 2017-11-14 18:44:10 +00:00
Richard Lewis
93eab05239 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/appTileStyling 2017-11-14 18:14:36 +00:00
Weblate
55170aa2a7 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 18:05:31 +00:00
Matthew Hodgson
534504b618
Merge pull request #5573 from vector-im/rxl881/visualCue
Widget styling tweaks
2017-11-14 18:05:27 +00:00
Weblate
e4fcf24f44 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 18:03:13 +00:00
Matthew Hodgson
bea95fde3a
Merge pull request #5567 from vector-im/rxl881/mixedContentWarnings
Center mixed content warnings in panel.
2017-11-14 18:03:08 +00:00
Richard Lewis
cf2850834e Add apps drawer bottom margin. 2017-11-14 17:32:01 +00:00
Richard Lewis
e3bdcf4d0d Remove unused edit_white icon 2017-11-14 15:42:29 +00:00
Richard Lewis
940f229102 Fix edit icon colors and add green edit icon. 2017-11-14 15:20:57 +00:00
Weblate
a22cd487a0 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 15:17:41 +00:00
Matthew Hodgson
69b8ff8668 add fixme 2017-11-14 15:17:32 +00:00
Weblate
03f1f7f75a Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 14:31:22 +00:00
Peter Vágner
e540fd40cb 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-14 14:31:21 +00:00
Matthew Hodgson
a7a9433ef9 fix 2ndary accent color on dark on FF
fixes https://github.com/vector-im/riot-web/issues/5583
2017-11-14 14:31:15 +00:00
Weblate
564ea8bfb2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-13 19:22:44 +00:00
Bamstam
261f91da6e 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-13 19:22:44 +00:00
Matthew Hodgson
557fd8f734
Merge pull request #5578 from vector-im/matthew/status
Status.im theme
2017-11-13 19:22:38 +00:00
Matthew Hodgson
809dd0856f add more fixmes 2017-11-13 16:35:39 +00:00
Matthew Hodgson
0a80774066 unstatusify redirects 2017-11-13 16:26:26 +00:00
Matthew Hodgson
5abee4fddc replace some of the status.im theme with general config options 2017-11-11 23:47:03 +00:00
Matthew Hodgson
47d9e7f2a1 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:37 -08:00
Richard Lewis
d7ceddfe61 Revert unintended merge commit. 2017-11-10 21:43:34 +00:00
Richard Lewis
42bb54b202 Set widget menu bar background colour. 2017-11-10 21:41:35 +00:00
Richard Lewis
7a42e844d1 Remove unused styling. 2017-11-10 20:16:32 +00:00
Richard Lewis
43fb359d8f Vertically align menu bar items. 2017-11-10 20:12:30 +00:00
Richard Lewis
31e0cde900 Improve hover border. 2017-11-10 20:12:12 +00:00
Richard Lewis
53143cb033 Center icons in menu bar. 2017-11-10 17:26:57 +00:00
Richard Lewis
7eeb7babc4 White edit icon (to avoid having to use css filters to invert). 2017-11-10 17:26:33 +00:00
Richard Lewis
883ec159e2 Add yellow warning triangle image. 2017-11-10 17:25:56 +00:00
Weblate
1b21b8cce2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-10 16:24:25 +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
Weblate
25bff3f4b1 Merge remote-tracking branch 'origin/develop' into develop 2017-11-10 15:21:04 +00:00
Tong Hui
71d0ecf37d Translated using Weblate (Chinese (Simplified))
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_Hans/
2017-11-10 14:14:56 +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