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

17873 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
7afd80e55b
Merge pull request #3408 from matrix-org/t3chguy/community_member_invite_IS_text 
Fix identity server text in AddressPickerDialog
 2019-09-13 15:45:22 +01:00
David Baker
05a26373e8
Merge pull request #3438 from matrix-org/travis/revoke-1 
Change copy for sharing an email
 2019-09-13 15:42:53 +01:00
RiotRobot
63f75a36e4 v1.5.3-rc.2 2019-09-13 14:23:39 +01:00
RiotRobot
3889917cba Prepare changelog for v1.5.3-rc.2 2019-09-13 14:23:38 +01:00
Bruno Windels
40bd1845d2
Merge pull request #3441 from matrix-org/bwindels/fixroomdir-itemclick-bis 
Fix: stop propagation click handler for <TR> doesn't run
 2019-09-13 13:08:42 +00:00
David Baker
3986d78d9e
Merge pull request #3443 from matrix-org/dbkr/fixroomdir-itemclick-bis_2 
Fix: stop propagation click handler for <TR> doesn't run
 2019-09-13 14:08:35 +01:00
Bruno Windels
6d13ea0043 stop propagation click handler for <TR> doesn't run 2019-09-13 14:07:36 +01:00
David Baker
3fb72cd1b7
Merge pull request #3442 from matrix-org/dbkr/report_event_2 
Add way to report the content of a message
 2019-09-13 13:42:35 +01:00
Michael Telatynski
c3d01715ff Improve ReportEventDialog as per PR feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-13 13:41:50 +01:00
Michael Telatynski
92af11bce7 fix indentation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-13 13:40:31 +01:00
Michael Telatynski
fc49290459 Add way to report the content of a message 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-13 13:40:25 +01:00
Bruno Windels
f73f08e998 stop propagation click handler for <TR> doesn't run 2019-09-13 14:33:09 +02:00
David Baker
e548e4d7a5
Merge pull request #3436 from matrix-org/travis/deactivate-release 
Fix synapse deactivate button for release
 2019-09-13 13:26:19 +01:00
David Baker
ca03a35296
Merge pull request #3440 from matrix-org/dbkr/fixroomdir-itemclick 
Fix: clicking on a room directory item takes you to the room
 2019-09-13 11:00:58 +01:00
Bruno Windels
820869d99b fix clicking on room dir item 2019-09-13 11:00:55 +01:00
Bruno Windels
fcfdcb4fd3
Merge pull request #3439 from matrix-org/bwindels/fixroomdir-itemclick 
Fix: clicking on a room directory item takes you to the room
 2019-09-13 09:55:37 +00:00
Bruno Windels
bf460dbd3d fix clicking on room dir item 2019-09-13 11:09:02 +02:00
Travis Ralston
f25529eed7 Change copy for sharing an email 
Fixes https://github.com/vector-im/riot-web/issues/10758
 2019-09-12 22:39:32 -06:00
Travis Ralston
27828a3785 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:31:58 -06:00
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
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
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
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
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
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
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
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
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