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 |
|
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 |
|
Bruno Windels
|
f73f08e998
|
stop propagation click handler for <TR> doesn't run
|
2019-09-13 14:33:09 +02: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 |
|
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
|
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 |
|
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 |
|
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 |
|
Bruno Windels
|
122e15156a
|
always show clear button in search box when focused
|
2019-09-12 12:21:18 +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 |
|
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 |
|
Michael Telatynski
|
d197fd90ad
|
Merge branches 'develop' and 't3chguy/nvl/fix_sso_flash' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/nvl/fix_sso_flash
|
2019-09-12 10:25:54 +01:00 |
|
Bruno Windels
|
7c97078764
|
always show clear button in search box when focused
|
2019-09-12 11:12:06 +02:00 |
|
Michael Telatynski
|
a4a85dc541
|
Hide the change HS url button on SSO login flow if custom urls disabled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-11 23:02:52 +01:00 |
|
Travis Ralston
|
ab6215f9aa
|
Merge pull request #3410 from matrix-org/t3chguy/disable_save_button_msg_edit_nochange
EditMessageComposer: disable Save button until a change has been made
|
2019-09-11 14:27:27 -06: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 |
|
Michael Telatynski
|
9c1fb13d5f
|
Apply PR feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-11 18:05:28 +01:00 |
|
Michael Telatynski
|
7c5e6ef2c5
|
regen 18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-11 18:05:26 +01:00 |
|
Michael Telatynski
|
7ddac8d475
|
Login: Add way to change HS from SSO Homeserver
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-11 18:04:11 +01:00 |
|
Michael Telatynski
|
c26d71b5aa
|
Login: don't assume supported flows, prevent login flash on SSO servers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-11 18:04:11 +01:00 |
|
Bruno Windels
|
ac65b28954
|
PR feedback
|
2019-09-11 18:03:15 +01:00 |
|
Bruno Windels
|
0cba5da03d
|
add redact recent messages button in member info
|
2019-09-11 18:03:09 +01:00 |
|
Bruno Windels
|
b67a2492b3
|
adapt design of room list in directory
|
2019-09-11 18:02:37 +01:00 |
|
Bruno Windels
|
9866efabe5
|
pr feedback
|
2019-09-11 17:58:14 +01:00 |
|
Bruno Windels
|
13a3cf3afe
|
consistent naming
Co-Authored-By: Travis Ralston <travpc@gmail.com>
|
2019-09-11 17:58:14 +01:00 |
|
Bruno Windels
|
cf8ca176e2
|
remove labels and add join/view & preview button instead in directory
|
2019-09-11 17:58:14 +01:00 |
|
Bruno Windels
|
ea7cbbc0ee
|
keep filter field expanded if it has text in it
|
2019-09-11 17:57:40 +01:00 |
|
Bruno Windels
|
b9421e4269
|
make add room button go to create room dialog instead of room directory
|
2019-09-11 17:57:40 +01:00 |
|
Bruno Windels
|
31682b61ce
|
make filter feed transparent when not focussed
|
2019-09-11 17:57:40 +01:00 |
|
Bruno Windels
|
b328fcb7e3
|
show shorter placeholder for filter feed when not focused
|
2019-09-11 17:57:40 +01:00 |
|
Bruno Windels
|
0fe31f843a
|
hide explore button when focusing filter field
|
2019-09-11 17:57:40 +01:00 |
|
Bruno Windels
|
4ffa8c7b4a
|
add explore button next to filter field
|
2019-09-11 17:57:40 +01:00 |
|
Travis Ralston
|
9e2cdecb9b
|
Add a button to MemberInfo to deactivate a user
Part of https://github.com/vector-im/riot-web/issues/4125
|
2019-09-11 17:44:29 +01: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
|
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 |
|
Michael Telatynski
|
792b70913c
|
invert and rename changed to saveDisabled for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-11 17:37:11 +01:00 |
|
Michael Telatynski
|
2ff98b7c1f
|
clear up ambiguity by poor naming
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-11 17:37:11 +01:00 |
|