Commit Graph

5691 Commits

Author SHA1 Message Date
Luke Barnard
c685546e9a Bump js-sdk to 0.9.2, react-sdk to 0.11.3 2017-12-04 12:27:49 +00:00
Weblate
bb6aabc017 Merge remote-tracking branch 'origin/develop' into develop 2017-12-04 12:26:11 +00:00
Luke Barnard
1a0c0af447 Bump js-sdk to 0.9.2, react-sdk to 0.11.3 2017-12-04 12:25:54 +00:00
Moo
491bb4fd1d Translated using Weblate (Lithuanian)
Currently translated at 39.7% (87 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lt/
2017-12-04 11:32:10 +00:00
Tirifto
a3e2698223 Translated using Weblate (Esperanto)
Currently translated at 84.4% (185 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-12-04 11:32:09 +00:00
Richard Lewis
380625241e Green camera icon 2017-12-03 11:25:52 +00:00
Moo
452fe44795 Added translation using Weblate (Lithuanian) 2017-12-01 22:15:02 +00:00
Luke Barnard
b0d115a64a Implement renumeration of ordered tags upon collision
I was being bitten by this enough for me to want to fix it. This implementation really ought to be improved such that it doesnt tend towards being broken the more it is used.
2017-12-01 18:20:38 +00:00
Luke Barnard
e80c4fadea Linting 2017-12-01 18:18:48 +00:00
Weblate
04ed2a3d09 Merge remote-tracking branch 'origin/develop' into develop 2017-12-01 14:12:39 +00:00
Luke Barnard
cc4890f0b8 Fix TagPanel bg on status theme 2017-12-01 14:12:31 +00:00
Weblate
7924ee65e0 Merge remote-tracking branch 'origin/develop' into develop 2017-12-01 12:04:15 +00:00
Luke Barnard
0aaae9bca5
Merge pull request #5751 from vector-im/luke/refactor-keycode-to-keyboard
Update imports for accessing KeyCode
2017-12-01 12:04:10 +00:00
Weblate
fb7a071c2a Merge remote-tracking branch 'origin/develop' into develop 2017-12-01 11:04:56 +00:00
Luke Barnard
a24c42b3a8 Realign collpased BottomLeftMenu with create group button 2017-12-01 11:04:46 +00:00
Luke Barnard
1ccffb7e58 Update imports for accessing KeyCode 2017-12-01 10:56:25 +00:00
Weblate
41c7d0cb41 Merge remote-tracking branch 'origin/develop' into develop 2017-11-30 11:07:38 +00:00
Luke Barnard
4e7a1e9653 Correctly position TagPanel createGroupButton 2017-11-30 11:07:27 +00:00
Weblate
0061d9ad6c Merge remote-tracking branch 'origin/develop' into develop 2017-11-30 10:12:46 +00:00
Matthew Hodgson
2a402985aa
Merge pull request #5685 from aidalgol/root-lang-attrib-fix
Set html lang attribute from language setting
2017-11-30 10:12:40 +00:00
Weblate
8c315c7e0b Merge remote-tracking branch 'origin/develop' into develop 2017-11-29 22:04:48 +00:00
Matthew Hodgson
f72b44650b fix tertiary accent colors 2017-11-29 22:04:40 +00:00
Weblate
8da2a29f86 Merge remote-tracking branch 'origin/develop' into develop 2017-11-29 18:50:31 +00:00
Luke Barnard
72563e6114 overflow hidden for groupPublicity scrollbox 2017-11-29 18:50:22 +00:00
Weblate
7153d03660 Merge remote-tracking branch 'origin/develop' into develop 2017-11-29 17:30:46 +00:00
Milan Korecký
fd63aac406 Translated using Weblate (Czech)
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/cs/
2017-11-29 17:30:44 +00:00
Luke Barnard
123ad19b28
Merge pull request #5723 from vector-im/luke/feature-tag-panel
CSS for new TagPanel
2017-11-29 17:30:40 +00:00
Luke Barnard
28132eaf36 Correct comment 2017-11-29 17:17:09 +00:00
Luke Barnard
0c43edb629 CSS for new TagPanel 2017-11-29 16:41:00 +00:00
Michael Telatynski
43578d2366
make FilteredList controlled, such that it can externally persist filter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-28 22:16:53 +00:00
Weblate
59f1cc3922 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 14:09:45 +00:00
Luke Barnard
63bedc440b
Merge pull request #5707 from vector-im/luke/allow-guest-view-group
getGroupStore no longer needs a matrix client
2017-11-28 14:09:39 +00:00
Luke Barnard
bbdafeff77 getGroupStore no longer needs a matrix client 2017-11-28 13:17:30 +00:00
Weblate
d02ae30023 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 11:25:49 +00:00
Luke Barnard
58b7530134
Merge pull request #5702 from vector-im/luke/move-group-flair-toggle-to-user-settings
CSS required for moving group publication toggles to UserSettings
2017-11-28 11:25:45 +00:00
Weblate
4f384b2325 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 11:22:34 +00:00
Richard van der Hoff
93f05ceea3 Merge branch 'master' into develop 2017-11-28 11:22:16 +00:00
Richard van der Hoff
5fff46fdac v0.13.2 2017-11-28 11:17:57 +00:00
Richard van der Hoff
0f5785c27b Prepare changelog for v0.13.2 2017-11-28 11:17:57 +00:00
Richard van der Hoff
854a665627 v0.13.2 2017-11-28 11:16:45 +00:00
Richard van der Hoff
2e9f309415 Bump to react-sdk 0.11.2 2017-11-28 11:16:13 +00:00
Luke Barnard
6fc173eaa9 CSS required for moving group publication toggles to UserSettings
See https://github.com/matrix-org/matrix-react-sdk/pull/1634
2017-11-27 18:59:33 +00:00
Weblate
15e5f13969 Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 18:59:00 +00:00
Luke Barnard
5f4d011606 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-11-27 18:58:42 +00:00
Luke Barnard
9da799c2dd GroupTile h3 becomes div for simpler reuse 2017-11-27 18:57:59 +00:00
Weblate
21b693f3c8 Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 18:11:12 +00:00
Mateo Castro
a7ac003064 Translated using Weblate (Spanish)
Currently translated at 95.8% (210 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2017-11-27 18:11:12 +00:00
xmeta
9ec1f9b07d Translated using Weblate (Japanese)
Currently translated at 32.8% (72 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
2017-11-27 18:11:11 +00:00
Neo_Chen
57f1dd1d68 Translated using Weblate (Chinese (Traditional))
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/zh_Hant/
2017-11-27 18:11:11 +00:00
David Baker
a346cf393d
Merge pull request #5630 from turt2live/travis/granular-theme
Make sure the SettingsStore is ready to load the theme before loading it
2017-11-27 18:11:07 +00:00