OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
19,022 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

19022 Commits (b5ffeb87a79ddb19a2617ef2b9797879f845798c)

Author SHA1 Message Date
Travis Ralston f4ebde1596 Wrap deactivation check with sanity conditions 
To ensure the matrixClient is not null (the problem) and that unexpected errors don't brick the app.

Fixes https://github.com/vector-im/riot-web/issues/10854
 2019-09-12 18:30:27 -06:00
Michael Telatynski 3fef6e6b22 Support Synapse deactivate on MemberInfo without Room (timeline pill) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-12 18:28:16 -06:00
RiotRobot d394e76254 v1.5.3-rc.1 2019-09-12 18:37:13 +01:00
RiotRobot a8df9956d9 Prepare changelog for v1.5.3-rc.1 2019-09-12 18:37:13 +01:00
David Baker 29eef9ad10
Merge pull request #3435 from matrix-org/dbkr/fix-filter-x_2 
Fix: only hide clear filter button when blurred & no more search term
 2019-09-12 18:27:22 +01:00
Bruno Windels d64cd58e93 only hide x button when blurred && no more search term 2019-09-12 18:26:12 +01:00
David Baker ac0810ab55
Merge pull request #3434 from matrix-org/dbkr/roomdirectorybuttonwrap_2 
Dont wrap text in room directory buttons
 2019-09-12 18:24:11 +01:00
Bruno Windels a4837d702a dont wrap text in room directory buttons 2019-09-12 18:24:17 +01:00
Weblate 075db5d831 Merge branch 'origin/develop' into Weblate. 2019-09-12 16:03:47 +00:00
Bruno Windels 7cb817c7bc
Merge pull request #3432 from matrix-org/bwindels/fix-filter-x 
Fix: only hide clear filter button when blurred & no more search term
 2019-09-12 16:03:44 +00:00
Weblate e9d297f2a9 Merge branch 'origin/develop' into Weblate. 2019-09-12 15:56:49 +00:00
송태섭 bee3419401 Translated using Weblate (Korean) 
Currently translated at 100.0% (1797 of 1797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-09-12 15:56:49 +00:00
David Baker 6f3f0f0a3c
Merge pull request #3430 from matrix-org/bwindels/roomdirectorybuttonwrap 
Dont wrap text in room directory buttons
 2019-09-12 16:56:45 +01:00
Bruno Windels 87f8000621 only hide x button when blurred && no more search term 2019-09-12 17:17:15 +02:00
Weblate 9fae9ef352 Merge branch 'origin/develop' into Weblate. 2019-09-12 14:11:36 +00:00
Michael Telatynski f95ab2eeb1
Merge pull request #3290 from matrix-org/t3chguy/report_event 
Add way to report the content of a message
 2019-09-12 15:11:32 +01:00
Bruno Windels 2bed264b0d dont wrap text in room directory buttons 2019-09-12 15:59:15 +02:00
Weblate ac03c381e4 Merge branch 'origin/develop' into Weblate. 2019-09-12 13:19:06 +00:00
Bruno Windels 1806e83247
Merge pull request #3428 from matrix-org/bwindels/breadcrumbs-after-10 
Breadcrumbs: only show after having joined at least 10 rooms
 2019-09-12 13:19:02 +00:00
Bruno Windels fb5a85db81 put min room count in constant 2019-09-12 15:12:18 +02:00
Weblate 2f32406217 Merge branch 'origin/develop' into Weblate. 2019-09-12 12:57:02 +00:00
Bruno Windels e6554bdaad
Merge pull request #3429 from matrix-org/bwindels/breadcrumbs-empty 
Breadcrumbs: show placeholder for empty slot
 2019-09-12 12:56:58 +00:00
Bruno Windels df8ce7fb33 Show placeholder for empty slot in breadcrumbs 2019-09-12 14:46:54 +02:00
David Baker ef7d8c42a8 Fix merge 2019-09-12 13:09:59 +01:00
Weblate fcfe0248bb Merge branch 'origin/develop' into Weblate. 2019-09-12 12:09:21 +00:00
Bruno Windels 94bdedd25b show breadcrumbs only after having joined at least 10 rooms 2019-09-12 14:07:46 +02:00
RiotRobot b0abb52518 Merge branch 'master' into develop 2019-09-12 13:07:27 +01:00
Weblate 9dfd68f273 Merge branch 'origin/develop' into Weblate. 2019-09-12 12:06:35 +00:00
RiotRobot cc072fb256 Merge branch 'release-v1.5.2' 2019-09-12 13:01:56 +01:00
RiotRobot 3f31666409 v1.5.2 2019-09-12 12:57:22 +01:00
RiotRobot 1e77f5f171 Prepare changelog for v1.5.2 2019-09-12 12:57:22 +01:00
RiotRobot bdcaaa95f8 Released js-sdk 2019-09-12 12:53:33 +01:00
Michael Telatynski 6dc69afe67 Merge branches 'develop' and 't3chguy/community_member_invite_IS_text' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/community_member_invite_IS_text 2019-09-12 12:53:32 +01:00
Michael Telatynski b6309a4294 Improve ReportEventDialog as per PR feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-12 12:52:11 +01:00
Michael Telatynski 9a15d4cfc1 Merge branches 'develop' and 't3chguy/report_event' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/report_event 
 Conflicts:
	src/i18n/strings/en_EN.json
 2019-09-12 12:45:16 +01:00
Michael Telatynski a40ecda993 Fix missed case of validAddressTypes being conditional 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-12 12:34:14 +01:00
Weblate 74b97c633b Merge branch 'origin/develop' into Weblate. 2019-09-12 11:29:07 +00:00
Michael Telatynski d7bac95270
Merge pull request #3421 from matrix-org/t3chguy/nvl/fix_sso_flash 
Hide the change HS url button on SSO login flow if custom urls disabled
 2019-09-12 12:29:03 +01:00
David Baker 08169c2920
Merge pull request #3427 from matrix-org/dbkr/register-selector-wrap_2 
Fix register page selector buttons growing too wide
 2019-09-12 12:23:06 +01:00
Bruno Windels d67a8d5ccd undo whitespace setting, accessible button is used in too many places to make this a safe assumption 2019-09-12 12:23:04 +01:00
David Baker bbea1635a6
Merge pull request #3426 from matrix-org/dbkr/lp-visualfixes_2 
Left panel: visual fixes
 2019-09-12 12:21:29 +01:00
Bruno Windels e4a452e4bd reduce vertical padding around explore/filter 2019-09-12 12:21:23 +01:00
Bruno Windels 122e15156a always show clear button in search box when focused 2019-09-12 12:21:18 +01:00
Bruno Windels c70736fe00 make explore button and filter field equal width 2019-09-12 12:21:12 +01:00
David Baker 6795da2ffa
Merge pull request #3425 from matrix-org/dbkr/fix_sso_flash_2 
Hide the change HS url button on SSO login flow if custom urls disabled
 2019-09-12 12:19:15 +01:00
Michael Telatynski 7c54359d3a Hide the change HS url button on SSO login flow if custom urls disabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-12 12:17:52 +01:00
David Baker 6dd0ad6e27
Merge pull request #3424 from matrix-org/dbkr/room_directory_pagination_spinner_2 
RoomDirectory: show spinner if loading more results
 2019-09-12 12:16:10 +01:00
Michael Telatynski 5091658dc7 Update Copyright 2019-09-12 12:16:01 +01:00
Michael Telatynski 8eb8b00460 RoomDirectory: show spinner if loading more results 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-12 12:15:56 +01:00
Weblate 4002c4764c Merge branch 'origin/develop' into Weblate. 2019-09-12 10:28:54 +00:00