PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
12261 commits 1 branch 0 tags 338 MiB
Commit graph

10206 commits

Author SHA1 Message Date
Weblate
1d4f95ad78 Merge remote-tracking branch 'origin/develop' into develop 2018-11-16 20:25:45 +00:00
Travis Ralston
7dd610b41e
Merge pull request #2235 from MaxwellKepler/develop 
Added badge to non-autoplay GIFs
 2018-11-16 13:25:40 -07:00
Besnik Bleta
ed7ed063f8 Translated using Weblate (Albanian) 
Currently translated at 92.1% (1180 of 1281 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 20:01:43 +00:00
Weblate
94b39cd309 Merge remote-tracking branch 'origin/develop' into develop 2018-11-16 19:36:22 +00:00
Akarshan Biswas
2787ebcc72 Translated using Weblate (Hindi) 
Currently translated at 9.0% (116 of 1280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
 2018-11-16 19:36:21 +00:00
Travis Ralston
2408eeeb3d
Merge pull request #2277 from matrix-org/travis/terms-auth-improvements 
Improve terms auth flow
 2018-11-16 12:36:17 -07:00
Travis Ralston
7df003ef74 Be more positive in property naming 2018-11-16 12:15:44 -07:00
Weblate
c4668dd1aa Merge remote-tracking branch 'origin/develop' into develop 2018-11-16 17:32:56 +00:00
Akarshan Biswas
ae6c46806c Translated using Weblate (Hindi) 
Currently translated at 4.1% (53 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
 2018-11-16 17:32:55 +00:00
Besnik Bleta
400ba219f1 Translated using Weblate (Albanian) 
Currently translated at 88.7% (1133 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 11:34:51 +00:00
David Baker
8281bdf875 Actually add the dialog 2018-11-16 11:33:09 +00:00
David Baker
e112641524 Handle crypto db version upgrade 
Display a dialog telling the user what the situation is with
options to sign out or continue withwout e2e.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/785
 2018-11-16 11:31:46 +00:00
Besnik Bleta
69a3b89405 Translated using Weblate (Albanian) 
Currently translated at 84.9% (1084 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 10:16:33 +00:00
Besnik Bleta
2122bf8384 Translated using Weblate (Albanian) 
Currently translated at 81.8% (1045 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 09:20:39 +00:00
Besnik Bleta
0e874fe17a Translated using Weblate (Albanian) 
Currently translated at 76.4% (976 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 08:54:41 +00:00
Besnik Bleta
f8fd2a5397 Translated using Weblate (Albanian) 
Currently translated at 74.7% (954 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 08:25:06 +00:00
Besnik Bleta
7a01468ab2 Translated using Weblate (Albanian) 
Currently translated at 74.7% (954 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 08:23:04 +00:00
Besnik Bleta
2e86bced22 Translated using Weblate (Albanian) 
Currently translated at 74.7% (954 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 08:19:38 +00:00
Besnik Bleta
3c3c503105 Translated using Weblate (Albanian) 
Currently translated at 70.6% (901 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 07:51:00 +00:00
Besnik Bleta
810405c67b Translated using Weblate (Albanian) 
Currently translated at 64.8% (827 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 07:01:08 +00:00
Travis Ralston
8916c90fed Make the 'Accept' button for consent a little more friendly 
Part of https://github.com/vector-im/riot-web/issues/7700
 2018-11-15 20:26:37 -07:00
Richard van der Hoff
90f22c7b43 Support for m.login.sso 
Adds support for the m.login.sso login type, which is handled the same way as
CAS, and also makes it look a bit nicer.
 2018-11-15 19:05:39 +00:00
Karol Kosek
41abc8dcdc Translated using Weblate (Polish) 
Currently translated at 93.5% (1194 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-11-15 12:02:34 +00:00
Kévin C
1472b8f8d0 Translated using Weblate (French) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-11-15 12:02:33 +00:00
Besnik Bleta
4e740eb136 Translated using Weblate (Albanian) 
Currently translated at 56.0% (715 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-15 12:01:39 +00:00
Travis Ralston
c8b38606cc Fix terms auth continue button CSS 2018-11-14 18:40:00 -07:00
Travis Ralston
2ffc024fab Add a dedicated "Continue" button to the terms auth stage 
The button itself is conditionally enabled because the ILAG dialog already has a continue button. It'd be confusing to users to have 2 continue buttons on the same dialog, so this commit adds the structure required to pass along clicks from the dialog's button down to the UI auth component. 

The other place the continue button would appear is on the register page (not ILAG). The button's style is different here, however that will be improved in a later commit. 

Part of https://github.com/vector-im/riot-web/issues/7700
 2018-11-14 18:26:35 -07:00
Travis Ralston
fe27fae80f Add m.login.terms to the ILAG-compatible flows 
Otherwise we get "Registration Required" instead of "Pick a username"

Part of https://github.com/vector-im/riot-web/issues/7700
 2018-11-14 17:59:24 -07:00
Jeff Huang
11126e9f7a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-11-14 02:54:58 +00:00
Yuriy Bulka
5a4e22558f Translated using Weblate (Ukrainian) 
Currently translated at 44.5% (569 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2018-11-13 17:58:51 +00:00
Kenneth Larsson
42acd7ea28 Translated using Weblate (Swedish) 
Currently translated at 99.6% (1271 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-11-13 17:58:51 +00:00
Suetsugu Kawamura
77cdad58ef Translated using Weblate (Japanese) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-11-13 17:58:50 +00:00
Ciarán Ainsworth
a539667438 Translated using Weblate (English (United States)) 
Currently translated at 68.1% (870 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2018-11-13 17:58:50 +00:00
Slavi Pantaleev
ed663ef654 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-11-13 09:33:02 +00:00
toriko
8a4fb3cb2f Translated using Weblate (Japanese) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-11-13 01:31:49 +00:00
Osoitz
df0bdabb83 Translated using Weblate (Basque) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-11-11 11:46:27 +00:00
Vasyĺ V. Vercynśkyj
cec9cc7d66 Translated using Weblate (Ukrainian) 
Currently translated at 40.5% (518 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2018-11-10 16:32:48 +00:00
Krombel
a050a0d556 Translated using Weblate (German) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-11-10 15:30:28 +00:00
Weblate
e986e05a3f Merge remote-tracking branch 'origin/develop' into develop 2018-11-09 10:52:36 +00:00
Suetsugu Kawamura
08cb18d9ca Translated using Weblate (Japanese) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-11-09 10:52:35 +00:00
Suetsugu Kawamura
8f7cab287e Translated using Weblate (Japanese) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-11-09 00:13:04 +00:00
Szimszon
761f9d6336 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-11-08 20:08:55 +00:00
Kévin C
f3aace1b3f Translated using Weblate (French) 
Currently translated at 100.0% (1276 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-11-08 17:01:10 +00:00
Weblate
d60710eaf3 Merge remote-tracking branch 'origin/develop' into develop 2018-11-08 16:30:44 +00:00
Suetsugu Kawamura
9533a33c88 Translated using Weblate (Japanese) 
Currently translated at 99.9% (1273 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-11-08 16:30:43 +00:00
Tirifto
bb1fedb361 Translated using Weblate (Esperanto) 
Currently translated at 87.3% (1113 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-11-08 16:30:43 +00:00
J. Ryan Stinnett
5e3af70a23 Translated using Weblate (English (United States)) 
Currently translated at 67.5% (860 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2018-11-08 16:30:43 +00:00
Krombel
c39f436327 Added translation using Weblate (Romanian) 2018-11-08 14:55:41 +00:00
random
af5586c83d Translated using Weblate (Italian) 
Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-11-08 14:30:20 +00:00
Travis Ralston
5d804e1e57 Appease the linter 2018-11-07 17:01:47 -07:00
Travis Ralston
88bfe6fc39 debugging--; 2018-11-07 16:59:24 -07:00
Travis Ralston
9017635c79 Support room IDs and event permalinks in the join command 
Mostly useful for power users who want to jump to places more easily.

Examples:
* `/join !somewhere:example.org`
* `/join !somewhere:example.org altserver.com` - to join through `altserver.com`
* `/goto https://matrix.to/#/!somewhere:example.org/$something:example.org?via=altserver.com`

Fixes https://github.com/vector-im/riot-web/issues/3248
Fixes https://github.com/vector-im/riot-web/issues/7543
 2018-11-07 16:53:29 -07:00
Travis Ralston
aeef80fb1c
Merge pull request #2268 from jryans/guest-warning 
Add visible guest warning to encourage login
 2018-11-07 13:15:34 -07:00
J. Ryan Stinnett
975392cbbb Add visible guest warning to encourage login 
If you happen to get logged out, it might not be very clear what has happened
visually. This adds a visible warning to the top of the home page to suggest
logging in.

Fixes vector-im/riot-web#7629.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-11-06 21:08:57 +01:00
Weblate
2b560dc4d6 Merge remote-tracking branch 'origin/develop' into develop 2018-11-05 15:49:36 +00:00
Suetsugu Kawamura
6df367f95a Translated using Weblate (Japanese) 
Currently translated at 75.6% (964 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-11-05 15:49:35 +00:00
Slavi Pantaleev
821cdc55c1 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-11-05 15:49:35 +00:00
Travis Ralston
ec2528e8b5
Update MatrixActionCreators.js 2018-11-04 23:00:47 -07:00
Travis Ralston
f9d5c11d8d Regenerate the room list when m.fully_read is issued 
Not doing so results in the RoomListStore tracking stale data when the user reads messages on another device. The visual effect of this is rooms being incorrectly pinned in places they shouldn't be, such as the top of the list. This also fixes another visual bug where rooms don't move down once their timelines are read. This second issue is mot prominent when multiple rooms have been pinned to the top, and the middle one is read ahead of the others - it'll stick around until some other condition decides to wipe the room's cached state.

Fixes https://github.com/vector-im/riot-web/issues/7653
 2018-11-04 19:47:24 -07:00
Krombel
450b226632 Translated using Weblate (German) 
Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-11-03 13:33:02 +00:00
Osoitz
578136fa30 Translated using Weblate (Basque) 
Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-11-03 08:24:10 +00:00
Slavi Pantaleev
50768327e2 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-11-02 18:17:17 +00:00
Suetsugu Kawamura
ade9c7002a Translated using Weblate (Japanese) 
Currently translated at 57.4% (732 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-11-02 15:39:13 +00:00
Szimszon
1ba96b97ea Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-11-02 12:07:03 +00:00
Kévin C
f7bc27413d Translated using Weblate (French) 
Currently translated at 100.0% (1274 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-11-02 09:01:44 +00:00
Weblate
c300514bc7 Merge remote-tracking branch 'origin/develop' into develop 2018-11-02 00:24:09 +00:00
Suetsugu Kawamura
6c908a3e08 Translated using Weblate (Japanese) 
Currently translated at 34.3% (437 of 1274 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-11-02 00:24:09 +00:00
Travis Ralston
3960ae2fcd Add more commentary around how the roomCache works 2018-11-01 17:17:01 -06:00
Travis Ralston
a713cc5c52 Compare the right types of events 2018-11-01 17:07:05 -06:00
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