eb4f5b76b3
Merge remote-tracking branch 'origin/develop' into develop
2018-02-14 11:33:53 +00:00
46b8fb9a19
Merge pull request #1746 from matrix-org/luke/fix-room-settings-resets
...
Store component state for editors
2018-02-14 11:33:48 +00:00
3020c8cd94
Fix custom tags not being ordered manually
...
Actually fixes vector-im/riot-web#6135 unlike #1748 , which
incorrectly assumed that custom tags would be included in
listOrders.
This fix makes sure that the `default` case in the `switch`
is actually used.
2018-02-14 11:23:29 +00:00
7ac350ea36
Give mx_RoomView_messageListWrapper its min-height: 100% back
...
because the spinner now exists separately to it
(as mx_RoomView_messagePanelSpinner) so their CSS is disentangled.
2018-02-14 11:17:21 +00:00
47c232b5b3
Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first
2018-02-14 11:00:27 +00:00
b3bb2d2aa5
Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first
2018-02-14 10:51:20 +00:00
9139dcbd1e
Merge remote-tracking branch 'origin/develop' into develop
2018-02-14 10:42:55 +00:00
14b0e85850
Translated using Weblate (Bulgarian)
...
Currently translated at 16.1% (36 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2018-02-14 10:42:52 +00:00
8c1d2a4555
Merge pull request #6140 from vector-im/luke/fix-tag-panel-css
...
Fix LeftPanel size being incorrect when TagPanel disabled
2018-02-14 10:42:49 +00:00
480c046fb1
Merge remote-tracking branch 'origin/develop' into develop
2018-02-14 10:31:43 +00:00
db2f6f863a
Translated using Weblate (Spanish)
...
Currently translated at 58.1% (573 of 986 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-02-14 10:31:43 +00:00
ed871cbd83
Translated using Weblate (Russian)
...
Currently translated at 100.0% (986 of 986 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-02-14 10:31:43 +00:00
02e0663409
Translated using Weblate (Catalan)
...
Currently translated at 88.3% (871 of 986 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-02-14 10:31:42 +00:00
bee0a952c3
Translated using Weblate (Bulgarian)
...
Currently translated at 0.2% (2 of 986 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-14 10:31:42 +00:00
7cc82a682c
Merge pull request #1745 from matrix-org/luke/fix-login-page-feedback
...
Give the login page its spinner back
2018-02-14 10:31:36 +00:00
009e01c1b0
Fix LeftPanel size being incorrect when TagPanel disabled
...
A previous PR (#6134 ) assumed that the TagPanel feature
would always be enabled, leading to strangeness when it
wasn't: #6136 .
(FTR the original layout bug was #6133 )
2018-02-14 10:18:12 +00:00
0d85a46e84
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2018-02-14 07:52:15 +00:00
d05b221a6c
Merge remote-tracking branch 'origin/develop' into develop
2018-02-13 22:03:03 +00:00
54f4563303
Translated using Weblate (Bulgarian)
...
Currently translated at 14.3% (32 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2018-02-13 22:03:02 +00:00
7aea7f9400
Merge pull request #6134 from vector-im/luke/fix-tag-panel-collapse
...
Fix TagPanel from collapsing to < 60px when LP collapsed
2018-02-13 22:02:58 +00:00
9abda76d9e
Merge branch 'develop' into luke/fix-tag-panel-collapse
2018-02-13 22:02:49 +00:00
42582c7ccd
Merge remote-tracking branch 'origin/develop' into develop
2018-02-13 20:45:44 +00:00
c88a59c228
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2018-02-13 20:45:44 +00:00
b54f949fe6
Translated using Weblate (Bulgarian)
...
Currently translated at 13.4% (30 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2018-02-13 20:45:43 +00:00
a966cc7dec
Merge pull request #6138 from vector-im/rxl881/llpFix
...
Temporary hack to constrain LLP container size.
2018-02-13 20:45:39 +00:00
55cacfba82
Temporary hack to constrain LLP container size.
2018-02-13 20:42:46 +00:00
3bc1eef39b
Translated using Weblate (Russian)
...
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2018-02-13 18:56:54 +00:00
ee7add05ae
Translated using Weblate (Catalan)
...
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
2018-02-13 18:46:42 +00:00
e7d1c04bb5
Translated using Weblate (French)
...
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2018-02-13 18:25:15 +00:00
247a3cebb9
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2018-02-13 18:00:42 +00:00
5bf0b7d652
Merge remote-tracking branch 'origin/develop' into develop
2018-02-13 17:32:54 +00:00
0b5fe1232f
Merge pull request #6137 from rbozhkova/patch-1
...
Fix typo
2018-02-13 17:32:50 +00:00
03be7eb32c
Merge remote-tracking branch 'origin/develop' into develop
2018-02-13 17:28:52 +00:00
24c9a06c80
Merge remote-tracking branch 'origin/develop' into develop
2018-02-13 17:28:48 +00:00
3a808411f5
Merge pull request #6127 from vector-im/luke/feature-tag-panel-tile-context-menu
...
Add context menu to TagPanel
2018-02-13 17:28:47 +00:00
c670b76ec8
Merge pull request #1743 from matrix-org/luke/feature-tag-panel-tile-context-menu
...
Add context menu to TagTile
2018-02-13 17:28:43 +00:00
06b18dda18
Added translation using Weblate (Bulgarian)
2018-02-13 17:23:42 +00:00
2524c5f861
Added translation using Weblate (Bulgarian)
2018-02-13 17:22:45 +00:00
db5f4193ec
Fix typo
2018-02-13 18:22:01 +01:00
11b0cc8211
Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu
2018-02-13 17:00:19 +00:00
a34fea8af8
Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu
2018-02-13 16:51:00 +00:00
8ae62b8526
Merge remote-tracking branch 'origin/develop' into develop
2018-02-13 16:15:55 +00:00
e0d598fb19
Merge pull request #1748 from matrix-org/luke/fix-manually-ordered-custom-tagged-rooms
...
If a tag is unrecognised, assume manual ordering
2018-02-13 16:15:49 +00:00
f16bc93fee
If a tag is unrecognised, assume manual ordering
...
(as we did previously)
Fixes https://github.com/vector-im/riot-web/issues/6135
2018-02-13 16:09:17 +00:00
285c4f91d3
Fix TagPanel from collapsing to < 60px when LP collapsed
...
Fixes https://github.com/vector-im/riot-web/issues/6133
2018-02-13 15:17:51 +00:00
5af560f625
Make removedTags a Set for perf
2018-02-13 14:43:34 +00:00
084ebe6e16
Merge remote-tracking branch 'origin/develop' into develop
2018-02-13 14:18:56 +00:00
1cdb1d841d
Merge remote-tracking branch 'origin/develop' into develop
2018-02-13 14:18:52 +00:00
e67147213b
Merge pull request #6096 from vector-im/luke/room-list-flux
...
Make room tagging flux-y
2018-02-13 14:18:50 +00:00
a0aa3df893
Merge pull request #1719 from matrix-org/luke/room-list-flux
...
Move RoomList state to RoomListStore
2018-02-13 14:18:46 +00:00
Weblate
David Baker
Luke Barnard
Ralitsa Bozhkova
Luke Barnard
Simó Albert i Beltran
Walter
Szimszon
Matthew Hodgson
Richard Lewis
Richard Lewis
Kévin C