mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 13:01:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
12307 commits 219 branches 562 tags 474 MiB
Commit graph

10237 commits

Author SHA1 Message Date
Travis Ralston
122868e32f Removing timing/performance tracking on room list store 
This was used to verify the fix was actually making improvements and can be safely taken out.
 2018-11-01 16:30:48 -06:00
Travis Ralston
0c7aadb92b Improve room list sort performance by caching common variables 
This won't help much if the user is in a ton of highly active rooms, but for the most part this will help those in thousands of rooms, many of which are likely to be quiet. 

Fixes https://github.com/vector-im/riot-web/issues/7646
Fixes https://github.com/vector-im/riot-web/issues/7645 (due to timestamp ordering)
 2018-11-01 16:28:13 -06:00
Travis Ralston
272acfa2f5 Appease the linter 2018-11-01 14:46:39 -06:00
Travis Ralston
5558b7a3b2 Avoid hitting the SettingsStore thousands of times when generating room lists 
Should fix https://github.com/vector-im/riot-web/issues/7646 to some degree
 2018-11-01 14:43:15 -06:00
Weblate
c818a360e8 Merge remote-tracking branch 'origin/develop' into develop 2018-11-01 14:04:20 +00:00
Karol Kosek
2589ce6a77 Translated using Weblate (Polish) 
Currently translated at 93.8% (1194 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-11-01 14:04:19 +00:00
Moo
4fbfc7cb4d Translated using Weblate (Lithuanian) 
Currently translated at 69.3% (882 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2018-11-01 14:04:19 +00:00
Suetsugu Kawamura
c6854c0811 Translated using Weblate (Japanese) 
Currently translated at 29.9% (381 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-11-01 14:04:19 +00:00
Travis Ralston
57b99893e5
Merge pull request #1936 from turt2live/travis/pinned-room-list 
Add options to pin unread/mentioned rooms to the top of the room list
 2018-11-01 08:04:12 -06:00
David Baker
6d6e6b5a4e Remove cryptic abbreviation 2018-10-31 20:01:36 +00:00
David Baker
1a878fc77a Quote consistency 2018-10-31 19:56:34 +00:00
David Baker
23332e16c5 keyBackupStatus event now has crypto. prefix 2018-10-31 18:07:29 +00:00
Michael Telatynski
328d57f063 Remove temporary account_deactivation_preferences 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-10-29 22:57:33 +00:00
David Baker
8ac62f8c12 Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-29 16:20:45 +00:00
Weblate
3f7e74142b Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 15:55:18 +00:00
David Baker
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
Weblate
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
Karol Kosek
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
Aaron Raimist
e61e7f2626
Fix eslint --fix 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 23:04:00 -05:00
Aaron Raimist
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
Aaron Raimist
49ce4ef117
eslint --fix src/ 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:50:38 -05:00
Travis Ralston
5b22d157a7 Fix candidate server encoding 2018-10-26 20:34:06 -06:00
Travis Ralston
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
Weblate
18f4edcd7a Merge remote-tracking branch 'origin/develop' into develop 2018-10-26 20:23:35 +00:00
Travis Ralston
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
Travis Ralston
0857e2c5e9 Clarify why we pick popular servers over the one that created the room 2018-10-26 12:21:27 -06:00
Travis Ralston
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
David Baker
de366fa0e8 Add cancel button to error stage 2018-10-26 17:55:59 +01:00
Weblate
a58e1c04fd Merge remote-tracking branch 'origin/develop' into develop 2018-10-26 16:46:34 +00:00
Travis Ralston
d802ee0fa2 Move the max candidates constant out of the function 2018-10-26 10:25:23 -06:00
Travis Ralston
c389540522 Appease the linter 2018-10-26 10:22:18 -06:00
Travis Ralston
ef8c9246aa Maybe fix UserSettings? 2018-10-26 10:07:21 -06:00
David Baker
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
Travis Ralston
ea8a37ff21 Merge branch 'develop' into travis/permalink-routing 2018-10-26 09:19:58 -06:00
Travis Ralston
6c23dc0020
Merge pull request #2252 from jryans/dialog-padding 
Repair DevTools button padding by centralizing styles
 2018-10-26 09:11:18 -06:00
Weblate
e3a60b9524 Merge remote-tracking branch 'origin/develop' into develop 2018-10-26 14:09:33 +00:00
J. Ryan Stinnett
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
Karol Kosek
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
Kévin C
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
Travis Ralston
aaeb6e4978 Use about:blank instead 2018-10-25 15:59:42 -06:00
Travis Ralston
749441b4d3 Merge branch 'develop' into travis/redirect-widgets 2018-10-25 15:57:26 -06:00
Travis Ralston
d58ff90ec1 Merge branch 'develop' into travis/permalink-routing 2018-10-25 15:23:33 -06:00
Travis Ralston
52094964a0 Fix the server candidate picker to actually work 
Tests do wonders.
 2018-10-25 15:23:15 -06:00
Travis Ralston
9cdb527163
Merge branch 'develop' into travis/pinned-room-list 2018-10-25 10:57:08 -06:00
David Baker
b59b8b7fca Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-25 17:42:46 +01:00
Osoitz
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
Weblate
777587827e Merge remote-tracking branch 'origin/develop' into develop 2018-10-25 15:23:21 +00:00
Karol Kosek
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
Jessica Wan
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
David Baker
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
David Baker
5e81e5b8b8 Fix variable scope 2018-10-25 15:07:19 +01:00
David Baker
401f6333ed Do...while loops are a thing 2018-10-25 14:54:32 +01:00
Travis Ralston
e8cb636631 Pick servers for ?via on matrix.to links based on some heuristics 2018-10-24 18:01:08 -06:00
Travis Ralston
6ee495b912 Merge remote-tracking branch 'origin/develop' into travis/permalink-routing 2018-10-24 16:36:39 -06:00
Szimszon
2707fcc575 Translated using Weblate (Hungarian) 
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/hu/
 2018-10-24 18:17:27 +00:00
Maxwell Kepler
5d35ce9449 Changed letter case. 2018-10-24 19:06:48 +01:00
Will Hunt
def0b2d8fb Add developertools option to UserSettings 2018-10-24 18:20:16 +01:00
Will Hunt
27a0f0ca62 Add i18n string 2018-10-24 18:16:55 +01:00
Will Hunt
8118a9c71a Wall devtools button behind a setting 2018-10-24 18:15:35 +01:00
Will Hunt
a5ae599dcb Add show developer tools option 2018-10-24 18:15:25 +01:00
Will Hunt
3c045f3f65 Revert i18n changes for en_US 2018-10-24 18:02:45 +01:00
Will Hunt
44a41b589d Comma on strings and styling button 2018-10-24 17:50:27 +01:00
Will Hunt
06c34cff9c Add devtools string 2018-10-24 17:37:13 +01:00
Will Hunt
79d467c551 Add button to open devtools in roomsettings 2018-10-24 17:36:58 +01:00
Travis Ralston
6b13a071f3
Merge pull request #2242 from aaronraimist/leave-group-warning 
Add warning when administrator leaves community (#5724)
 2018-10-24 10:26:25 -06:00
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
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
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
Maxwell Kepler
5e9db3647a Fixed minor typo in comment 2018-10-22 21:03:39 +01:00
Maxwell Kepler
54f9231582 Added badge to GIFs (https://github.com/vector-im/riot-web/issues/7344) 2018-10-22 20:57:58 +01: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
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
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
Travis Ralston
71a97170d7 Linting 2018-10-18 17:06:47 -06:00
Travis Ralston
0030ba7015 Support .well-known discovery 
Fixes https://github.com/vector-im/riot-web/issues/7253
 2018-10-18 16:42:54 -06:00
Slavi Pantaleev
fc4d4acace Translated using Weblate (Bulgarian) 
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/bg/
 2018-10-18 12:22:59 +00:00
Kévin C
7b8506ba65 Translated using Weblate (French) 
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/fr/
 2018-10-18 07:10:04 +00:00
Travis Ralston
af8dfda9a7 Add a bit of text to explain the purpose of the RoomPreviewSpinner 
Fixes https://github.com/vector-im/riot-web/issues/5869
 2018-10-17 13:53:12 -06:00
Szimszon
2f94631720 Translated using Weblate (Hungarian) 
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/hu/
 2018-10-17 17:50:11 +00:00
Osoitz
e1be8966bc Translated using Weblate (Basque) 
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/eu/
 2018-10-17 15:45:55 +00:00
Weblate
c3c5ceab11 Merge remote-tracking branch 'origin/develop' into develop 2018-10-17 14:15:23 +00:00
Szimszon
336ea96c91 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1269 of 1269 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-10-17 14:15:22 +00:00
Kévin C
482360742f Translated using Weblate (French) 
Currently translated at 100.0% (1269 of 1269 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-10-17 14:15:22 +00:00
Bruno Windels
b7c05d8dec
Merge pull request #2216 from matrix-org/bwindels/stickersi18nfix 
add missing sticker translation
 2018-10-17 14:15:18 +00:00
random
2295347d8d Translated using Weblate (Italian) 
Currently translated at 100.0% (1269 of 1269 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-10-17 09:25:02 +00:00
Szimszon
7d60e09f8e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1269 of 1269 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-10-16 18:05:25 +00:00
Krombel
d504cdeb85 Translated using Weblate (German) 
Currently translated at 100.0% (1269 of 1269 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-10-16 15:52:35 +00:00
Weblate
47cb441fc6 Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 15:47:53 +00:00
Travis Ralston
fbadb588e1
Merge pull request #2221 from matrix-org/travis/tos-register 
Support m.login.terms during registration
 2018-10-16 09:47:48 -06:00
Weblate
6af9998b62 Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 15:30:15 +00:00
Travis Ralston
06764c2bab
Merge pull request #2220 from matrix-org/travis/peek-invite-nag 
Don't show the invite nag bar when peeking
 2018-10-16 09:30:09 -06:00
Travis Ralston
b929c36222 Documentation++ 2018-10-16 09:19:36 -06:00
Weblate
43ee22897b Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 14:08:09 +00:00
Travis Ralston
49bd5441d1
Merge pull request #2214 from matrix-org/travis/fix-default-tint 
Apply the user's tint once the MatrixClientPeg is moderately ready
 2018-10-16 08:08:02 -06:00
Will Hunt
67d39a40d3 Sneaky , 2018-10-16 11:26:04 +01:00
Will Hunt
fcce61bf14 Merge remote-tracking branch 'upstream/develop' into hs/upload-limits 2018-10-16 11:21:15 +01:00
Weblate
1d4832a2a4 Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 08:45:53 +00:00
David Baker
589633d98f
Merge pull request #2217 from matrix-org/dbkr/rageshake_dont_use_all_the_memory 
Make rageshake use less memory
 2018-10-16 09:45:48 +01:00
Travis Ralston
d87ab8aac0 Support m.login.terms during registration 
Fixes https://github.com/vector-im/riot-web/issues/7168
Requires https://github.com/matrix-org/synapse/pull/4004
 2018-10-15 16:39:59 -06:00
Travis Ralston
6323d78b0c Move tinter init to MatrixChat 
This is a much better place for it to live
 2018-10-15 14:41:00 -06:00
Travis Ralston
f8fd0c34cb Merge branch 'develop' into travis/fix-default-tint 2018-10-15 14:37:34 -06:00
Travis Ralston
2d62fda862 Don't show the invite nag bar when peeking 2018-10-15 14:35:36 -06:00
Travis Ralston
94aac62f25 Move the login box from the left sidebar to where the composer is 
Fixes https://github.com/vector-im/riot-web/issues/4227

This includes removing the collapse button that isn't needed anymore.
 2018-10-15 14:26:24 -06:00
Will Hunt
5a72a5863f Merge remote-tracking branch 'upstream/develop' into hs/upload-limits 2018-10-15 19:20:55 +01:00
Weblate
0ce0ccc2dd Merge remote-tracking branch 'origin/develop' into develop 2018-10-15 15:27:34 +00:00
Bruno Windels
0912b8dcc2
Merge pull request #2218 from matrix-org/bwindels/phasedrollout 
Phased rollout of lazy loading
 2018-10-15 17:27:28 +02:00
Bruno Windels
f9f7abb0d1 fix lint 2018-10-15 17:01:30 +02:00
Bruno Windels
478c06c32e this file starts in 2018 2018-10-15 16:43:52 +02:00
Bruno Windels
ef204b6e99 check if phased rollout has expired before trying to enable LL 2018-10-15 16:41:24 +02:00
Bruno Windels
2ac9b26257 phased rollout expired function 2018-10-15 16:40:51 +02:00
David Baker
259d3608ee Make rageshake use less memory 
If an individual log is larger than the max size, ignore the rest
of it. Also build the string as we go rather than joining it all
together at the end, that way we only need the whole string + one
chunk in memory at once, rather than the whole string x 2.
 2018-10-15 15:23:44 +01:00
Bruno Windels
127fcf58a9 add missing sticker translation 2018-10-15 13:57:06 +02:00
Weblate
94b147d90c Merge remote-tracking branch 'origin/develop' into develop 2018-10-15 10:34:11 +00:00
Karol Kosek
b813e3b714 Translated using Weblate (Polish) 
Currently translated at 89.9% (1140 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-15 10:34:11 +00:00
David Baker
bd35825779
Merge pull request #2212 from matrix-org/dbkr/autocomplete 
Fix autocomplete
 2018-10-15 11:34:05 +01:00
Travis Ralston
3d8f0adf56 Move pinned rooms check to the RoomListStore 2018-10-12 14:35:54 -06:00
Travis Ralston
103ed71eb5 Merge branch 'develop' into travis/pinned-room-list 2018-10-12 14:09:52 -06:00
Travis Ralston
ebcc65dc7e Apply the user's tint once the MatrixClientPeg is moderately ready 
Any earlier and we risk getting NPEs from the peg not existing.

Fixes https://github.com/vector-im/riot-web/issues/6424
 2018-10-12 13:52:58 -06:00
Aaron Raimist
9f1b1d2028
Fix more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:50:24 -05:00
Aaron Raimist
a66dbccef8
Fix lint errors in MessageComposerInput.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:46:55 -05:00
Aaron Raimist
1287d9c49b
Fix lint errors in Notifications.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:44:02 -05:00
Aaron Raimist
d452dd2b74
Fix lint error in LazyLoadingResyncDialog.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:32:25 -05:00
Aaron Raimist
752d816780
Fix some more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:06:01 -05:00
Aaron Raimist
954d49f22e
Fix lint errors in ContentRules.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:04:56 -05:00
Aaron Raimist
fb1deee387
Fix lint errors in NotificationUtils.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:01:49 -05:00
Aaron Raimist
6b5650dbb1
Fix lint errors in PushRuleVectorState.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:01:13 -05:00
Aaron Raimist
6d8649855a
Fix lint errors in VectorPushRulesDefinitions.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 21:59:20 -05:00
Aaron Raimist
c83521bb31
Fix lint errors in rageshake.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 21:58:22 -05:00
Aaron Raimist
58488c076e
Fix more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 21:54:55 -05:00
Aaron Raimist
a2944c9faa
Fix lint errors in VectorConferenceHandler.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 21:54:25 -05:00
David Baker
9c8c84485a Fix user autocompleting 
This rewrites quite a lot of QueryMatcher.
 * Remove FuzzyMatcher which was a whole file of commented out code
   that just deferred to QueryMatcher
 * Simplify & remove some cruft from QueryMatcher, eg. most of the
   KeyMap stuff was completely unused.
 * Don't rely on object iteration order, which fixes a bug where
   users whose display names were entirely numeric would always
   appear first...
 * Add options.funcs to QueryMatcher to allow for indexing by things
   other than keys on the objects
 * Use above to index users by username minus the leading '@'
 * Don't include the '@' in the query when autocomple is triggered
   by typing '@'.

Fixes https://github.com/vector-im/riot-web/issues/6782
 2018-10-11 18:34:01 +01:00
David Baker
6c3acdff82
Merge pull request #2209 from matrix-org/bwindels/turnllonbydefault 
turn LL on by default!
 2018-10-11 15:29:33 +01:00
Bruno Windels
6ed0777c96 turn it on! 2018-10-11 15:55:21 +02:00
Tim Stahel
2c74d51a40 Translated using Weblate (English (United States)) 
Currently translated at 64.6% (819 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2018-10-11 10:18:05 +00:00
Weblate
f64c274ef3 Merge remote-tracking branch 'origin/develop' into develop 2018-10-11 10:09:29 +00:00
David Baker
9c8e5119ba
Merge pull request #2206 from matrix-org/dbkr/slate_update_fix_quote 
Fix quote post slate update
 2018-10-11 11:09:25 +01:00
David Baker
3efc09586b More API changes 2018-10-11 10:47:36 +01:00
David Baker
4d1f2cdfa9 Fix quote post slate update 
Missed API update
 2018-10-11 10:29:55 +01:00
David Baker
b267798010 Kill FuzzyMatcher 
This has been commented out for ages. Just remove it and make things
use QueryMatcher directly rather than looking like they do fuzzy matching
but not.
 2018-10-10 19:18:06 +01:00
Weblate
99789a94c1 Merge remote-tracking branch 'origin/develop' into develop 2018-10-10 16:35:41 +00:00
Bruno Windels
bba04a6820
Merge pull request #2205 from matrix-org/dbkr/lazy_load_check_before_sync 
Handle InvalidStoreError from js-sdk
 2018-10-10 18:35:36 +02:00
David Baker
655627209a unused function 2018-10-10 17:25:32 +01:00
David Baker
0abcb5c78d Handle InvalidStoreError from js-sdk 
js-sdk now emits sync state ERROR with an InvalidStoreError if the
store needs to be cleared before it can be used.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/759
 2018-10-10 17:07:17 +01:00
Weblate
ff7365ddef Merge remote-tracking branch 'origin/develop' into develop 2018-10-10 14:59:06 +00:00
Bruno Windels
dfb4c594a8
Merge pull request #2204 from matrix-org/bwindels/rrfallbackavatars 
Fall back to default avatar in RR when member isn't loaded yet
 2018-10-10 16:58:59 +02:00
random
9c5691300b Translated using Weblate (Italian) 
Currently translated at 100.0% (1267 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-10-10 14:41:22 +00:00
Bruno Windels
f360b2db90 forward prop updates to children in Velociraptor with React.cloneElement 2018-10-10 16:15:50 +02:00
Bruno Windels
5128386160 allow read receipts without an existing member in MessagePanel 2018-10-10 16:15:20 +02:00
Bruno Windels
0767c278e7 put userId next to member in read receipt, fall back when member missing 2018-10-10 16:14:09 +02:00
Weblate
29c9e17afa Merge remote-tracking branch 'origin/develop' into develop 2018-10-10 10:10:25 +00:00
David Baker
97ed4ed0bb
Merge pull request #2202 from matrix-org/dbkr/update_slate 
Update to new version of slate
 2018-10-10 11:10:20 +01:00
David Baker
6f9d673b79 Focus composer after closing room settings 
For some reason the slate update means the composer doesn't
have the focus after closing the room settings, and the end to end
tests pick this up!
 2018-10-09 17:35:40 +01:00
David Baker
4e1fabd140 Remove spurious ...atributes in the wrong place 
We already have it above
 2018-10-09 16:05:14 +01:00
Krombel
1ac7216ed7 Translated using Weblate (German) 
Currently translated at 100.0% (1267 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-10-09 13:27:56 +00:00
David Baker
67e8a6f9dc Recovery key formatting is now done by the js-sdk 2018-10-09 14:01:58 +01:00
Weblate
c349648714 Merge remote-tracking branch 'origin/develop' into develop 2018-10-09 10:04:55 +00:00
David Baker
41bc42e7d7
Merge pull request #2194 from pvagner/more_accessible_buttons 
More accessible buttons - take 2
 2018-10-09 11:04:50 +01:00
David Baker
c1f51a76dd Update to new version of slate 
Lots of fixes here as a lot of the API has changed (eg. anchorKey /
offsetKey are now anchor.key and offset.key, and collapseFocusToThing
is moveFocusToThing).

Also changes the ref to a function (sorry for lumping this into the
same PR).

Hopefully will fix https://github.com/vector-im/riot-web/issues/7105
 2018-10-09 10:55:55 +01:00
Weblate
0bc79b506f Merge remote-tracking branch 'origin/develop' into develop 2018-10-09 08:58:37 +00:00
David Baker
a16e92e5e0
Merge pull request #2200 from matrix-org/bwindels/rageshakeerrorcode 
log correct error code when opening log idb
 2018-10-09 09:58:31 +01:00
Jeff Huang
fa0d2c2609 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1267 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-10-09 00:11:15 +00:00
Kévin C
fc1ec589cd Translated using Weblate (French) 
Currently translated at 100.0% (1267 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-10-08 21:37:24 +00:00
Weblate
d10c680bbe Merge remote-tracking branch 'origin/develop' into develop 2018-10-08 15:10:26 +00:00
Bruno Windels
864c80c6ca Merge branch 'master' into develop 2018-10-08 17:09:59 +02:00
Slavi Pantaleev
b79ec8f46f Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1267 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-10-08 14:21:21 +00:00
Bruno Windels
cc962c975b show warning when LL is disabled but was enabled before 2018-10-08 16:09:46 +02:00
David Baker
573029af74 Fall back to another store if indexeddb start fails 
If we can't start indexeddb, fall back to a different store.

Previously we just ignored the exception and ploughed on anyway, on
the assumption that startup() was just for the indexeddb store to
load data anyway, and if that failed it would just do an initial
/sync instead (and also we'd keep trying to save the sync back which
would fail...). Then, in the previous release we started pulling
the settings out of the store on startup, making the assumpton that
the store actually worked, so the read obviously failed and the app
failed to start up.

This makes Riot work in Tor browser / firefox in daft mode again.
 2018-10-08 16:08:07 +02:00
David Baker
fd64369a5f Fix error logging 2018-10-08 16:08:00 +02:00
Szimszon
e18de584fb Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1267 of 1267 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-10-08 14:05:53 +00:00
David Baker
f4ae3855d0 Remove old migration code 
...as instructed!
 2018-10-08 16:05:41 +02:00
Weblate
de24acb069 Merge remote-tracking branch 'origin/develop' into develop 2018-10-08 13:41:09 +00:00
Bruno Windels
20885b8eb1
Merge pull request #2201 from matrix-org/bwindels/dialogonlldisable 
show warning when LL is disabled but was enabled before
 2018-10-08 15:41:04 +02:00
Weblate
4042408f78 Merge remote-tracking branch 'origin/develop' into develop 2018-10-08 13:38:06 +00:00
giqtaqisi
47ee750148 Translated using Weblate (Lojban) 
Currently translated at 24.7% (312 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/jbo/
 2018-10-08 13:38:05 +00:00
Silvano
47a8163220 Translated using Weblate (Italian) 
Currently translated at 100.0% (1263 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-10-08 13:38:05 +00:00
Tim Stahel
ed8c3bf012 Translated using Weblate (English (United States)) 
Currently translated at 64.8% (819 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2018-10-08 13:38:04 +00:00
RainSlide
803a4d9868 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.3% (1255 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-10-08 13:38:04 +00:00
Osoitz
8f0be5c2bf Translated using Weblate (Basque) 
Currently translated at 100.0% (1263 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-10-08 13:38:04 +00:00
Bruno Windels
86da88052a
Merge pull request #2195 from matrix-org/dbkr/indexeddb_fallback 
Fall back to another store if indexeddb start fails
 2018-10-08 15:37:59 +02:00
Bruno Windels
48299bb154 show warning when LL is disabled but was enabled before 2018-10-08 15:28:00 +02:00
Bruno Windels
14b040e6a6 log correct error code when opening log idb 2018-10-08 15:14:03 +02:00
David Baker
387128ed1e Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-05 14:01:50 +01:00
Weblate
51d078aee5 Merge remote-tracking branch 'origin/develop' into develop 2018-10-05 12:25:27 +00:00
giqtaqisi
825c256159 Translated using Weblate (Lojban) 
Currently translated at 19.9% (252 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/jbo/
 2018-10-05 12:25:26 +00:00
Besnik Bleta
388614042a Translated using Weblate (Albanian) 
Currently translated at 23.0% (291 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-10-05 12:25:25 +00:00
David Baker
a81589ffb5 Silence bluebird warnings 2018-10-05 12:15:03 +01:00
Krombel
0750a40ae2 Translated using Weblate (German) 
Currently translated at 100.0% (1263 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-10-04 20:36:33 +00:00
Weblate
d0b2eeb59e Merge remote-tracking branch 'origin/develop' into develop 2018-10-04 19:57:55 +00:00
giqtaqisi
0c565c2e87 Translated using Weblate (Lojban) 
Currently translated at 17.2% (218 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/jbo/
 2018-10-04 19:57:54 +00:00
Travis Ralston
aea9dbe1b8
Merge pull request #2197 from matrix-org/hs/object-urls-video 
Use createObjectURL instead of readAsDataURL for videos
 2018-10-04 13:57:50 -06:00
Weblate
20c95e745a Merge remote-tracking branch 'origin/develop' into develop 2018-10-04 19:29:07 +00:00
giqtaqisi
8b0eb40abe Translated using Weblate (Lojban) 
Currently translated at 17.1% (217 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/jbo/
 2018-10-04 19:29:06 +00:00
David Baker
a6f177c80b Translated using Weblate (English (United States)) 
Currently translated at 64.6% (817 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2018-10-04 19:29:06 +00:00
Travis Ralston
93d32f97fc
Merge pull request #2183 from matrix-org/travis/settings-no-sniping 
Track how far the user travels before dismissing their user settings
 2018-10-04 13:29:00 -06:00
Slavi Pantaleev
d073f3f7f5 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1263 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-10-04 17:26:24 +00:00
random
22dd416efe Translated using Weblate (Italian) 
Currently translated at 100.0% (1263 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-10-04 14:03:25 +00:00
David Baker
18661e042d Fall back to another store if indexeddb start fails 
If we can't start indexeddb, fall back to a different store.

Previously we just ignored the exception and ploughed on anyway, on
the assumption that startup() was just for the indexeddb store to
load data anyway, and if that failed it would just do an initial
/sync instead (and also we'd keep trying to save the sync back which
would fail...). Then, in the previous release we started pulling
the settings out of the store on startup, making the assumpton that
the store actually worked, so the read obviously failed and the app
failed to start up.

This makes Riot work in Tor browser / firefox in daft mode again.
 2018-10-04 13:40:56 +01:00
Peter Vágner
faf63e9b99 Translated using Weblate (Slovak) 
Currently translated at 100.0% (1263 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-10-04 11:48:29 +00:00
Weblate
8a3093d7e8 Merge remote-tracking branch 'origin/develop' into develop 2018-10-04 09:46:20 +00:00
giqtaqisi
8286456794 Translated using Weblate (Lojban) 
Currently translated at 15.5% (196 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/jbo/
 2018-10-04 09:46:19 +00:00
David Baker
8ceca3abe9
Update Pill.js 
Commas are not semicolons
 2018-10-04 10:34:34 +01:00
Osoitz
41c9b0be62 Translated using Weblate (Basque) 
Currently translated at 100.0% (1263 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-10-03 19:16:38 +00:00
Will Hunt
1e5101aa0c
The comment can go 2018-10-03 19:39:47 +01:00
Will Hunt
17915b5082
Merge branch 'develop' into hs/purge-irc-hack 2018-10-03 19:39:14 +01:00
Will Hunt
fe788486b7 Drop (IRC) suffix hacks 2018-10-03 19:34:06 +01:00
Weblate
71beb9386c Merge remote-tracking branch 'origin/develop' into develop 2018-10-03 18:08:50 +00:00
giqtaqisi
f3a947305e Translated using Weblate (Lojban) 
Currently translated at 15.2% (192 of 1263 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/jbo/
 2018-10-03 18:08:49 +00:00
David Baker
1189b75409
Merge pull request #2192 from matrix-org/dbkr/remove_migration_code 
Remove old migration code
 2018-10-03 19:08:44 +01:00
David Baker
1ec0f04baf Remove old migration code 
...as instructed!
 2018-10-03 18:33:34 +01:00
David Baker
849f0f796a js-sdk now handles recovery key formatting 2018-10-03 12:02:50 +01:00
Will Hunt
259063eda6
Remove useless comment. 2018-10-03 10:39:09 +01:00
Weblate
c7e08f3160 Merge remote-tracking branch 'origin/develop' into develop 2018-10-03 03:24:18 +00:00
Aaron Raimist
91e8ee98a1
Fix brace style in TextForEvent.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-02 22:12:39 -05:00
Weblate
9484141a87 Merge remote-tracking branch 'origin/develop' into develop 2018-10-02 19:27:36 +00:00