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

5710 Commits

Author SHA1 Message Date
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
Stefan Parviainen fcd58a2544 Update translating docs 2017-11-14 22:50:27 +01:00
Stefan Parviainen ca4b71b6e2 Update to use newer _t() 2017-11-14 21:54:00 +01: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
Luke Barnard ad0cb6f0a8 v0.13.0-rc.3 2017-11-14 14:22:29 +00:00
Luke Barnard 29ddf98592 Prepare changelog for v0.13.0-rc.3 2017-11-14 14:22:28 +00:00
Luke Barnard 5e8ddc6d7c v0.13.0-rc.3 2017-11-14 14:21:44 +00:00
Luke Barnard e1c762dcaa Bump react-sdk version to 0.11.0-rc.3 2017-11-14 14:20:21 +00:00
Travis Ralston 977599a660 Use the SettingsStore to get the theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-13 13:14:29 -07:00
Travis Ralston 7570ce580f Merge branch 'develop' into travis/granular 2017-11-13 12:25:56 -07: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
Luke Barnard ef9f2f7ce6 v0.13.0-rc.2 2017-11-10 16:53:03 +00:00
Luke Barnard d9bb6c52b4 Prepare changelog for v0.13.0-rc.2 2017-11-10 16:53:03 +00:00
Luke Barnard ea0cfa92b4 v0.13.0-rc.2 2017-11-10 16:52:24 +00:00
Luke Barnard 150fa43735 Bump react-sdk dep 2017-11-10 16:51:05 +00:00
Luke Barnard 718f48ba04 Merge branch 'develop' into release-v0.13.0 2017-11-10 16:50:11 +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