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 |
|
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 |
|