mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity
17919 commits 214 branches 561 tags 414 MiB
Commit graph

17919 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
ccbfcaf818 Merge branch 'origin/develop' into Weblate. 2019-09-11 20:26:55 +00:00
Travis Ralston
9622ec9a1a
Merge pull request #3416 from matrix-org/t3chguy/nvl/room_directory_pagination_spinner 
RoomDirectory: show spinner if loading more results
 2019-09-11 14:26:51 -06:00
Weblate
9803c5deae Merge branch 'origin/develop' into Weblate. 2019-09-11 20:24:29 +00:00
Szimszon
b4c651023d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1792 of 1792 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-09-11 20:24:29 +00:00
Travis Ralston
8b7d7190bd
Merge pull request #3417 from matrix-org/t3chguy/nvl/fix_sso_flash 
SSO Login: don't assume m.login.password, ask server before showing
 2019-09-11 14:24:24 -06:00
Michael Telatynski
6f736e8407 Apply PR feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski
370d9d8336 regen 18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski
76e4363452 Login: Add way to change HS from SSO Homeserver 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski
bf30cfe699 Fix other test 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski
1c7d67e8b3 fix test 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Michael Telatynski
f1ea5ff6f3 Login: don't assume supported flows, prevent login flash on SSO servers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:44:04 +01:00
Weblate
9b564d62a6 Merge branch 'origin/develop' into Weblate. 2019-09-11 16:42:13 +00:00
Travis Ralston
f0e230a30f
Merge pull request #3270 from matrix-org/t3chguy/react16 
Switch to React 16
 2019-09-11 10:42:10 -06:00
Michael Telatynski
980e9839ac Update Copyright 2019-09-11 17:22:45 +01:00
Michael Telatynski
0d28cd5840 RoomDirectory: show spinner if loading more results 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-11 17:22:45 +01:00
Weblate
bf665caac9 Merge branch 'origin/develop' into Weblate. 2019-09-11 16:15:00 +00:00
Michael Telatynski
81ea230a35
Merge pull request #3406 from matrix-org/t3chguy/reply_to_search_results 
Fix replying from search results for this and all rooms
 2019-09-11 17:14:55 +01:00
Weblate
16a329a26b Merge branch 'origin/develop' into Weblate. 2019-09-11 16:12:42 +00:00
Michael Telatynski
379fab8068
Merge pull request #3411 from matrix-org/t3chguy/synapse_deactivate_memberinfo_no_room 
Support Synapse deactivate on MemberInfo without Room (timeline pill)
 2019-09-11 17:12:38 +01:00
Weblate
f52fc4d6cd Merge branch 'origin/develop' into Weblate. 2019-09-11 15:56:23 +00:00
Kévin C
5a5db80e44 Translated using Weblate (French) 
Currently translated at 100.0% (1792 of 1792 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-09-11 15:56:23 +00:00
J. Ryan Stinnett
f23f35bbe9
Merge pull request #3419 from matrix-org/jryans/settings-3pid-state 
Lift 3PID state management up to Settings tab
 2019-09-11 16:56:18 +01:00
J. Ryan Stinnett
c542ea5559 Force boolean value 2019-09-11 16:55:45 +01:00
Weblate
c6dd722f30 Merge branch 'origin/develop' into Weblate. 2019-09-11 15:39:09 +00:00
Kévin C
786fe68816 Translated using Weblate (French) 
Currently translated at 100.0% (1790 of 1790 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-09-11 15:39:09 +00:00
Bruno Windels
1bbc977166
Merge pull request #3418 from matrix-org/bwindels/room-directory-design 
Room directory: update design
 2019-09-11 15:39:04 +00:00
J. Ryan Stinnett
db33c138aa Update all 3PID state in Settings when IS changes 
This ensures we update all 3PID state (like bind status) whenever the IS
changes.
 2019-09-11 16:21:42 +01:00
J. Ryan Stinnett
0b7995dc11 Improve terms handling for 3PID state gathering 
This changes the 3PID state gathering (used in Settings) to ignore terms errors
(no modals will be shown) on the assumption that other UX handles this case.
 2019-09-11 16:21:42 +01:00
J. Ryan Stinnett
f04c347df7 Lift 3PID state management up to Settings tab 
This pulls the 3PID state management in Settings up to a single location so that
the Account and Discovery sections now work from a single list that updates
immediately.

Fixes https://github.com/vector-im/riot-web/issues/10519
 2019-09-11 16:21:42 +01:00
Weblate
493ee1be00 Merge branch 'origin/develop' into Weblate. 2019-09-11 15:07:10 +00:00
Kévin C
b06a1b4b10 Translated using Weblate (French) 
Currently translated at 100.0% (1788 of 1788 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-09-11 15:07:10 +00:00
Tuomas Hietala
b40a56ea80 Translated using Weblate (Finnish) 
Currently translated at 97.7% (1746 of 1788 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-09-11 15:07:09 +00:00
Bruno Windels
1703913118
Merge pull request #3413 from matrix-org/bwindels/room-directory-buttons 
Room directory: add action buttons on room directly
 2019-09-11 15:07:03 +00:00
Bruno Windels
886402fe31 reduce padding on dialogs, as in design 2019-09-11 16:23:59 +02:00
Bruno Windels
24c4a16da1 adapt design of room list in directory 2019-09-11 16:23:59 +02:00
Bruno Windels
77175fcbc4 pr feedback 2019-09-11 16:18:34 +02:00
Bruno Windels
094c9e3468
consistent naming 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-09-11 14:15:46 +00:00
Bruno Windels
6f62cdb22c basic styling to make it look ok before applying new design 2019-09-11 15:45:51 +02:00
Bruno Windels
7754e08d84 remove labels and add join/view & preview button instead in directory 2019-09-11 15:45:51 +02:00
Weblate
1e49f5f56b Merge branch 'origin/develop' into Weblate. 2019-09-11 11:54:28 +00:00
Kenneth Larsson
3510d4a64f Translated using Weblate (Swedish) 
Currently translated at 78.8% (1408 of 1786 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2019-09-11 11:54:28 +00:00
송태섭
fe3ff59011 Translated using Weblate (Korean) 
Currently translated at 100.0% (1786 of 1786 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-09-11 11:54:24 +00:00
Szimszon
a5d6c88b6c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1786 of 1786 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-09-11 11:54:24 +00:00
Bruno Windels
62ddc1e544
Merge pull request #3412 from matrix-org/bwindels/explore-button 
Add explore button in left panel to go show room directory
 2019-09-11 11:54:18 +00:00
Bruno Windels
ad2e16d432 keep filter field expanded if it has text in it 2019-09-11 13:46:18 +02:00
Weblate
3d7c3667a4 Merge branch 'origin/develop' into Weblate. 2019-09-10 18:43:09 +00:00
Travis Ralston
7fcabd799d
Merge pull request #3415 from matrix-org/travis/min-updates 
Only update m.accepted_terms if there were changes
 2019-09-10 12:43:05 -06:00
Weblate
e229938fc2 Merge branch 'origin/develop' into Weblate. 2019-09-10 18:38:44 +00:00
Travis Ralston
ccd42900f7
Merge pull request #3414 from matrix-org/travis/address-picker-stack 
Make uses of AddressPickerDialog static dialogs
 2019-09-10 12:38:40 -06:00
Travis Ralston
b35d56167e const-antly annoying linter 
although it's a valid complaint here
 2019-09-10 11:16:45 -06:00