Commit graph

17928 commits

Author SHA1 Message Date
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
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
Bruno Windels
a4f8f34368
Merge pull request #3423 from matrix-org/bwindels/register-selector-wrap
Fix register page selector buttons growing too wide
2019-09-12 10:28:50 +00:00
Bruno Windels
cc67742fa9 undo whitespace setting, accessible button is used in too many places to make this a safe assumption 2019-09-12 12:24:05 +02:00
Bruno Windels
3c13210992
Merge pull request #3422 from matrix-org/bwindels/lp-visualfixes
Left panel: visual fixes
2019-09-12 09:30:00 +00:00
Bruno Windels
95060d4e95 reduce vertical padding around explore/filter 2019-09-12 11:27:20 +02: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
Bruno Windels
4ae4e68967 make explore button and filter field equal width 2019-09-12 11:11:32 +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
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
RiotRobot
77ae78ad24 v1.5.2-rc.1 2019-09-11 18:46:13 +01:00
RiotRobot
455f493c5d Prepare changelog for v1.5.2-rc.1 2019-09-11 18:46:12 +01:00
RiotRobot
491087c1cf js-sdk rc.1 2019-09-11 18:43:30 +01:00
David Baker
f680df4b37
Merge pull request #3420 from matrix-org/ftue_first_pass
Merge first pass of First Time User Experience to release branch
2019-09-11 18:19:55 +01: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
95e7e366ed Fix other test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 18:04:11 +01:00
Michael Telatynski
4719084af2 fix test
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
86d7389b64 reduce padding on dialogs, as in design 2019-09-11 18:02:43 +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
810977a916 basic styling to make it look ok before applying new design 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
0a31c2662a make input fields on a dark panel have a white background (filter field) 2019-09-11 17:57:40 +01:00
Bruno Windels
f32b1f4f39 make explore button white on hover 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