a40f1933f2
put RightPanel as sibling of .mx_RoomView_body instead of RoomView
2018-10-30 18:13:17 +01:00
790299f2d2
introduce MainSplit, to split between room/group body and right panel
2018-10-30 18:12:21 +01:00
e80a1c5051
move room/group panel header buttons into room/group header
2018-10-30 17:15:19 +01:00
4972b1ba7c
move aux panel into room body
...
to put a resize handle between the body and the right panel later on
2018-10-30 13:25:06 +01:00
328d57f063
Remove temporary account_deactivation_preferences
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-10-29 22:57:33 +00:00
8ac62f8c12
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-29 16:20:45 +00:00
3f7e74142b
Merge remote-tracking branch 'origin/develop' into develop
2018-10-29 15:55:18 +00:00
33e2fc28b7
Merge pull request #2254 from matrix-org/travis/permalink-routing-2
...
Fix and test matrix.to alias permalinks
2018-10-29 15:55:11 +00:00
b57fc50620
Merge remote-tracking branch 'origin/develop' into develop
2018-10-29 05:21:47 +00:00
8fc8c5e780
Translated using Weblate (Telugu)
...
Currently translated at 22.7% (290 of 1272 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/
2018-10-29 05:21:47 +00:00
ac669e824b
Translated using Weblate (Polish)
...
Currently translated at 93.4% (1189 of 1272 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-10-29 05:21:46 +00:00
e61e7f2626
Fix eslint --fix
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-26 23:04:00 -05:00
5f3b03c85a
Fix a few no-useless-escape lint errors
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-26 23:00:54 -05:00
49ce4ef117
eslint --fix src/
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2018-10-26 22:50:38 -05:00
5b22d157a7
Fix candidate server encoding
2018-10-26 20:34:06 -06:00
3bc5e2beb3
Fix and test matrix.to alias permalinks
...
Fixes https://github.com/vector-im/riot-web/issues/7614
Regression of https://github.com/matrix-org/matrix-react-sdk/pull/2250
2018-10-26 19:47:53 -06:00
18f4edcd7a
Merge remote-tracking branch 'origin/develop' into develop
2018-10-26 20:23:35 +00:00
0bd1d6b778
Merge pull request #2250 from matrix-org/travis/permalink-routing
...
Support routing matrix.to links to joinable rooms
2018-10-26 14:23:30 -06:00
0857e2c5e9
Clarify why we pick popular servers over the one that created the room
2018-10-26 12:21:27 -06:00
3734c8ab91
Don't mention that matrix.org is likely to be popular
...
This is untrue for quite a few real scenarios, including private federations and a ton of rooms.
2018-10-26 12:21:02 -06:00
de366fa0e8
Add cancel button to error stage
2018-10-26 17:55:59 +01:00
a58e1c04fd
Merge remote-tracking branch 'origin/develop' into develop
2018-10-26 16:46:34 +00:00
d802ee0fa2
Move the max candidates constant out of the function
2018-10-26 10:25:23 -06:00
c389540522
Appease the linter
2018-10-26 10:22:18 -06:00
ef8c9246aa
Maybe fix UserSettings?
2018-10-26 10:07:21 -06:00
156ffd1334
Fix autoreplacement of ascii emoji
...
More slate API updates in code paths I didn't test
Fixes https://github.com/vector-im/riot-web/issues/7509
2018-10-26 17:01:44 +01:00
ea8a37ff21
Merge branch 'develop' into travis/permalink-routing
2018-10-26 09:19:58 -06:00
6c23dc0020
Merge pull request #2252 from jryans/dialog-padding
...
Repair DevTools button padding by centralizing styles
2018-10-26 09:11:18 -06:00
3d07f45370
remove CreateRoom page, dead code
2018-10-26 17:10:32 +02:00
e3a60b9524
Merge remote-tracking branch 'origin/develop' into develop
2018-10-26 14:09:33 +00:00
33925b2fd1
fix after merge conflict error
2018-10-26 15:57:57 +02:00
2c039483c6
Merge branch 'develop' into experimental
2018-10-26 15:33:39 +02:00
2dc335798d
Repair DevTools button padding by centralizing styles
...
This moves the padding styles for dialog content to the .mx_Dialog rule. In
addition, it fixes vector-im/riot-web#7548 where the DevTools buttons had double
padding.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com >
2018-10-26 14:15:46 +02:00
ff1552c2f0
Translated using Weblate (Polish)
...
Currently translated at 93.3% (1188 of 1272 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-10-26 09:13:35 +00:00
2bdff52937
Translated using Weblate (French)
...
Currently translated at 100.0% (1272 of 1272 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-10-26 06:57:43 +00:00
aaeb6e4978
Use about:blank instead
2018-10-25 15:59:42 -06:00
749441b4d3
Merge branch 'develop' into travis/redirect-widgets
2018-10-25 15:57:26 -06:00
d58ff90ec1
Merge branch 'develop' into travis/permalink-routing
2018-10-25 15:23:33 -06:00
52094964a0
Fix the server candidate picker to actually work
...
Tests do wonders.
2018-10-25 15:23:15 -06:00
9cdb527163
Merge branch 'develop' into travis/pinned-room-list
2018-10-25 10:57:08 -06:00
b59b8b7fca
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-25 17:42:46 +01:00
4eb9363348
Translated using Weblate (Basque)
...
Currently translated at 100.0% (1272 of 1272 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-10-25 15:33:42 +00:00
777587827e
Merge remote-tracking branch 'origin/develop' into develop
2018-10-25 15:23:21 +00:00
694f04b6cb
Translated using Weblate (Polish)
...
Currently translated at 92.7% (1180 of 1272 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-10-25 15:23:20 +00:00
4e5ed99fec
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 98.6% (1255 of 1272 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-10-25 15:23:19 +00:00
85bb8392c4
Merge pull request #2247 from matrix-org/dbkr/fix_emoji_replacement
...
Fix emoji replacement in composer
2018-10-25 16:23:13 +01:00
5e81e5b8b8
Fix variable scope
2018-10-25 15:07:19 +01:00
401f6333ed
Do...while loops are a thing
2018-10-25 14:54:32 +01:00
adee0fdcef
Merge pull request #2248 from matrix-org/bwindels/memberpanel
...
Redesign: basic makeover of member info panel
2018-10-25 14:52:54 +01:00
3096bf42ef
fix css in chrome
2018-10-25 15:20:51 +02:00
Bruno Windels