David Baker
78d8d22457
Fix emoji replacement in composer
...
* Re-scan the slate document tree on each emoji replacement since
doing a replacement will invalidate all the offsets we have.
* Reset the emoji regex each time we use it.
Fixes https://github.com/vector-im/riot-web/issues/7550
2018-10-24 16:46:06 +01:00
Travis Ralston
d7367a7cfd
Merge branch 'develop' into travis/permalink-routing
2018-10-24 09:12:14 -06:00
David Baker
4c3c8a6285
Merge pull request #2244 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2018-10-24 11:20:02 +01:00
Victor Grousset
ef50e05580
Translated using Weblate (Esperanto)
...
Currently translated at 86.3% (1098 of 1271 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-10-24 09:24:46 +00:00
Aaron Raimist
fe901142aa
Split long string over two lines
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 17:20:57 -05:00
Aaron Raimist
92bfb42784
Use one string instead of two
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 13:11:36 -05:00
Aaron Raimist
a6c78ace4f
Add warning when administrator leaves community
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 12:25:12 -05:00
Weblate
87ae1ce458
Merge remote-tracking branch 'origin/develop' into develop
2018-10-23 09:18:12 +00:00
RainSlide
690405d3f6
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 98.7% (1255 of 1271 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-10-23 09:18:11 +00:00
David Baker
5206719663
Merge pull request #2223 from matrix-org/travis/fix-group-members
...
Show the group member list again
2018-10-23 10:18:06 +01:00
Weblate
a5ea073350
Merge remote-tracking branch 'origin/develop' into develop
2018-10-23 04:44:19 +00:00
Travis Ralston
8ff1da11ed
Merge pull request #2237 from aaronraimist/camel-case
...
lint: make colorScheme camel case
2018-10-22 22:44:14 -06:00
Aaron Raimist
1aa3085958
Oh right, can't change these
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-22 23:33:38 -05:00
Aaron Raimist
cb033bcadd
Why not change it everywhere while we're at it
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-22 23:16:07 -05:00
Aaron Raimist
4b3c865959
lint: make colorScheme camel case
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-22 23:07:47 -05:00
Weblate
11a0437df1
Merge remote-tracking branch 'origin/develop' into develop
2018-10-23 02:18:12 +00:00
Travis Ralston
879ef7f52b
Merge pull request #2236 from aaronraimist/leave-room-button
...
Change leave room button text, OK -> Leave
2018-10-22 20:18:07 -06:00
FeiYang
6774fd7acc
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1271 of 1271 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-10-23 02:02:24 +00:00
Aaron Raimist
41bd6e4366
Change leave room button text, OK -> Leave
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-22 20:55:24 -05:00
Travis Ralston
78f527cf95
Remove unused classes
2018-10-22 15:14:21 -06:00
Travis Ralston
f2cac45543
Merge branch 'develop' into travis/fix-group-members
2018-10-22 15:02:01 -06:00
Szimszon
2b9a646760
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1271 of 1271 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-10-22 18:45:24 +00:00
Weblate
1fd6155163
Merge remote-tracking branch 'origin/develop' into develop
2018-10-22 18:34:37 +00:00
Victor Grousset
60b1b30c51
Translated using Weblate (Esperanto)
...
Currently translated at 86.4% (1098 of 1270 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-10-22 18:34:36 +00:00
J. Ryan Stinnett
4335dfea16
Translated using Weblate (English (United States))
...
Currently translated at 65.1% (828 of 1270 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2018-10-22 18:34:36 +00:00
David Baker
9976c4eba5
Merge pull request #2231 from matrix-org/travis/dialog-buttons
...
Move all dialog buttons to the right and fix their order
2018-10-22 15:00:35 +01:00
David Baker
c677dd8a24
Merge pull request #2225 from matrix-org/travis/join-room-text
...
Add a bit of text to explain the purpose of the RoomPreviewSpinner
2018-10-22 13:11:09 +01:00
David Baker
b8153dcec7
Merge pull request #2219 from matrix-org/travis/login-register-composer
...
Move the login box from the left sidebar to where the composer is
2018-10-22 13:05:19 +01:00
Weblate
21d426821a
Merge remote-tracking branch 'origin/develop' into develop
2018-10-22 07:37:42 +00:00
sergio
e9a62bff2e
Translated using Weblate (Russian)
...
Currently translated at 95.9% (1219 of 1270 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-10-22 07:37:42 +00:00
hamster
83ebe3752d
Translated using Weblate (Polish)
...
Currently translated at 91.8% (1166 of 1270 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-10-22 07:37:42 +00:00
Victor Grousset
b3d5612746
Translated using Weblate (Esperanto)
...
Currently translated at 86.4% (1098 of 1270 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-10-22 07:37:41 +00:00
FeiYang
2ac10dd6b1
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1270 of 1270 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-10-22 07:37:41 +00:00
Bruno Windels
8532828b46
Merge pull request #2230 from matrix-org/travis/fix-canonical-aliases
...
Fix an error where React doesn't like value=null on a select
2018-10-22 07:37:23 +00:00
Karol Kosek
2a6ae17e6a
Translated using Weblate (Polish)
...
Currently translated at 91.6% (1164 of 1270 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-10-20 16:07:08 +00:00
Oliwer
51a03a700a
Translated using Weblate (Polish)
...
Currently translated at 91.6% (1164 of 1270 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-10-20 15:31:16 +00:00
Travis Ralston
7ef08314b8
Redirect widgets to another location before deleting them
...
This is so that shutdown hooks in the widget can correctly fire, such as Jitsi's hook to abandon its hold on the webcam.
Fixes https://github.com/vector-im/riot-web/issues/7351
2018-10-19 16:23:19 -06:00
Weblate
b17bf05761
Merge remote-tracking branch 'origin/develop' into develop
2018-10-19 22:23:01 +00:00
Travis Ralston
c75beb0196
Revert "Redirect widgets to another location before deleting them"
...
This reverts commit 275d88dd4f
.
2018-10-19 16:22:48 -06:00
Weblate
7df85725f7
Merge remote-tracking branch 'origin/develop' into develop
2018-10-19 22:22:35 +00:00
Travis Ralston
275d88dd4f
Redirect widgets to another location before deleting them
...
This is so that shutdown hooks in the widget can correctly fire, such as Jitsi's hook to abandon its hold on the webcam.
Fixes https://github.com/vector-im/riot-web/issues/7351
2018-10-19 16:22:20 -06:00
Travis Ralston
9582c1e65a
Move all dialog buttons to the right and fix their order
...
Fixes https://github.com/vector-im/riot-web/issues/5689
Some dialogs had their own CSS that prevented the buttons from being placed in the right spot. This has been fixed by using a generic standard for the buttons. The only strange dialog that needed more CSS was the devtools dialog due to the header.
Not all dialogs have been checked - I spot-checked about half of them and verified the CSS manually on an established account. It's hard to get at all the dialogs without convoluted testing.
2018-10-19 15:33:23 -06:00
Travis Ralston
49efefa630
Fix an error where React doesn't like value=null on a select
...
This only happens when there are no canonical aliases for a room.
2018-10-19 14:18:05 -06:00
Travis Ralston
7383133846
Support parsing matrix.to links in the timeline with ?via= in them
...
This ends up being translated to ?server_name= in the matrix-js-sdk, although that has a bug at the time of writing. It converts `server_name: ['a', 'b']` to `?server_name=a,b` instead of `?server_name=a&server_name=b`
For reference: the `viaServers` option is routed through the 'join_room' action to RoomViewStore#_joinRoom which is passed directly to the js-sdk http-api#joinRoom function.
Next steps:
* Fix the js-sdk parsing
* Make the SDK generate matrix.to links with ?via=
2018-10-19 13:31:18 -06:00
Weblate
b0d84fe4c4
Merge remote-tracking branch 'origin/develop' into develop
2018-10-19 14:40:21 +00:00
Bruno Windels
2ec9745939
Merge branch 'master' into develop
2018-10-19 16:39:59 +02:00
Bruno Windels
167746f41d
v0.14.1
2018-10-19 16:39:08 +02:00
Bruno Windels
0f592f5887
Prepare changelog for v0.14.1
2018-10-19 16:39:07 +02:00
Travis Ralston
fa14d0ed3c
Move tinter init to MatrixChat
...
This is a much better place for it to live
2018-10-19 16:33:00 +02:00
Jeff Huang
eb517fe2e9
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1270 of 1270 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-10-19 01:18:40 +00:00