OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
25,865 Commits
215 Branches
561 Tags
462 MiB
Commit Graph

25865 Commits (446f3e35e9443808934fe8b724d0928d3400d65d)

Author SHA1 Message Date
Michael Telatynski 446f3e35e9
Merge pull request #4846 from matrix-org/t3chguy/notifications0 
Fix Room Custom Sounds regression and make ProgressBar relevant again
 2020-06-30 16:56:57 +01:00
Michael Telatynski cd06910713
Merge pull request #4854 from matrix-org/t3chguy/fix-redirect-loop 
Including start_sso and start_cas in redirect loop prevention
 2020-06-30 16:56:38 +01:00
Travis Ralston bb9ae7b55b
Merge pull request #4850 from matrix-org/travis/room-list/todo-cleanup 
Clean up TODO comments for new room list
 2020-06-29 13:10:52 -06:00
RiotRobot 0059d44e15 Merge branch 'master' into develop 2020-06-29 16:10:32 +01:00
RiotRobot e43311c0f4 v2.8.1 2020-06-29 15:59:37 +01:00
RiotRobot 9329be3bb8 Prepare changelog for v2.8.1 2020-06-29 15:59:36 +01:00
Michael Telatynski b2b909aa53 Including start_sso and start_cas in redirect loop prevention 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 15:40:20 +01:00
J. Ryan Stinnett 7c9b8baf09
Merge pull request #4852 from matrix-org/jryans/no-4s-release 
Support accounts with cross signing but no SSSS
 2020-06-29 14:14:15 +01:00
J. Ryan Stinnett 518db90b69 Support accounts with cross signing but no SSSS 
Port https://github.com/matrix-org/matrix-react-sdk/pull/4717 to release
 2020-06-29 13:55:06 +01:00
J. Ryan Stinnett d1d4bef795
Merge pull request #4622 from aaronraimist/redaction-timestamp 
Show timestamp of redaction on hover
 2020-06-29 11:10:25 +01:00
Travis Ralston 175ade8ac4 Merge branch 'develop' into travis/room-list/todo-cleanup 2020-06-28 20:04:41 -06:00
Travis Ralston a36a03bd05
Merge pull request #4849 from matrix-org/travis/room-list/remove-dm 
Remove the DM button from new room tiles
 2020-06-28 20:04:12 -06:00
Travis Ralston 62467144ba Update i18n 2020-06-28 20:03:55 -06:00
Travis Ralston ee2c216c4d Clean up TODO comments for new room list 
All relevant TODOs should still be present, and reference an issue for easy finding.
 2020-06-28 20:03:04 -06:00
Travis Ralston 753f7aa5b8 Remove the DM button from new room tiles 
Fixes https://github.com/vector-im/riot-web/issues/14221
 2020-06-27 22:48:54 -06:00
Travis Ralston b9ce10bd6d
Merge pull request #4848 from Georift/room-list/fix-show-less-visibility 
Hide room list show less button if it would do nothing
 2020-06-27 22:22:51 -06:00
☕ Tim c8381021b8 Hide room list show less button if it would do nothing 
Signed-off-by: ☕ Tim <tim@wants.coffee>

On the new rooms list, if the show less button wouldn't result in a
smaller list, don't show it.

Fixes vector-im/riot-web#14219
 2020-06-28 04:08:06 +08:00
Michael Telatynski 10492fe72f fix StyledRadioGroup React key warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-27 18:30:15 +01:00
Michael Telatynski cf3c914382 Merge branches 'develop' and 't3chguy/notifications0' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-26 15:35:36 +01:00
Travis Ralston 5172c7b205
Merge pull request #4823 from matrix-org/travis/room-list/preview-copy 
Improve message preview copy in new room list
 2020-06-26 07:33:19 -06:00
Travis Ralston 67cc84d00d Merge branch 'develop' into travis/room-list/preview-copy 2020-06-26 07:29:49 -06:00
Travis Ralston f96682f3c2
Merge pull request #4844 from matrix-org/travis/room-list/tag-panel 
Allow the tag panel to be disabled in the new room list
 2020-06-26 07:27:51 -06:00
Travis Ralston 3abc9d8d56 Merge branch 'develop' into travis/room-list/tag-panel 2020-06-26 07:26:57 -06:00
Travis Ralston 424443927f
Merge pull request #4843 from matrix-org/travis/room-list/user-menu 
Make the whole user row clickable in the new room list
 2020-06-26 07:25:50 -06:00
Michael Telatynski f830a4b7fc delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 14:22:59 +01:00
Michael Telatynski 72035c8078 Make <ProgressBar /> relevant again 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 14:19:58 +01:00
Michael Telatynski 46058a17f8 Fix Room Custom Sounds regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 14:18:38 +01:00
Andrew Morgan ab80ea1c2d
Merge pull request #4842 from matrix-org/anoa/new_spinner 
Add a new spinner design behind a labs flag
 2020-06-26 10:37:37 +01:00
Andrew Morgan 77b618e4f3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into anoa/new_spinner 
* 'develop' of github.com:matrix-org/matrix-react-sdk:
  bandaid
  make js-sdk import happy?
  ts-ignore because something is made of fail
  js-sdk imports suck
  Iterate on the new room list resize handle
  Welcome no longer needs any props
  unexport things which need not exporting
  Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas
  Move to mx_sso_hs_url and co for sso persistance to not conflict with guest creds
  Fix Welcome.html URLs
  improve typing
  Add account and room-account data hooks
  Create a StaticNotificationState for representative purposes
  Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab
 2020-06-26 10:17:26 +01:00
Michael Telatynski 113dfc5ed2
Merge pull request #4845 from matrix-org/t3chguy/hf1 
ts-ignore because something is made of fail
 2020-06-26 10:10:18 +01:00
Andrew Morgan e790a31f09 Include newline at end of _InlineSpinner.scss 2020-06-26 09:44:47 +01:00
Andrew Morgan 96e4b938b2 Don't modify the size of the MessagePanel spinner 2020-06-26 09:42:44 +01:00
Andrew Morgan a2e33a2386 Prevent old InlineSpinner gif from spinning 2020-06-26 09:41:18 +01:00
Michael Telatynski a905028d3a bandaid 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:37:55 +01:00
Michael Telatynski 274e6f3825 make js-sdk import happy? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:35:29 +01:00
Andrew Morgan 228a6adfdf indentation 2020-06-26 09:27:33 +01:00
Michael Telatynski 9391d151f3 ts-ignore because something is made of fail 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:15:02 +01:00
Michael Telatynski 538c853149
Merge pull request #4838 from matrix-org/t3chguy/hf1 
Fix Welcome.html CAS and SSO URLs not working
 2020-06-26 09:09:39 +01:00
Travis Ralston 7ce3cc1db7 Allow the tag panel to be disabled in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14156
 2020-06-25 20:35:40 -06:00
Travis Ralston 555758d3d2 Remove extra space 2020-06-25 20:23:37 -06:00
Travis Ralston 1888cda5ee Remove debug 2020-06-25 20:22:41 -06:00
Travis Ralston 588fea3a9b Make the menu show up where it was before 2020-06-25 19:55:08 -06:00
Travis Ralston 411271422c Make the whole UserMenu a button to open the menu 2020-06-25 19:54:17 -06:00
Travis Ralston bcfdd4d984 Move all of the UserMenu into the UserMenu component 2020-06-25 19:38:11 -06:00
Travis Ralston dafce40d1b Rename UserMenuButton to UserMenu for new scope 2020-06-25 19:29:12 -06:00
Andrew Morgan b00d822bc0 Remove alt, use aria-label 2020-06-26 01:22:49 +01:00
Andrew Morgan 87f961df3f Put behind a labs flag 2020-06-26 01:22:46 +01:00
Andrew Morgan 6ea5dc7b7c Change the look of the spinner 2020-06-26 01:19:38 +01:00
Michael Telatynski 6116cfc2b9 js-sdk imports suck 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 23:52:32 +01:00
Michael Telatynski 85c5bb3bc3
Merge pull request #4835 from matrix-org/t3chguy/notifications0 
More small tweaks in preparation for Notifications rework
 2020-06-25 23:34:28 +01:00