OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
26,235 Commits
211 Branches
549 Tags
664 MiB
Commit Graph

26235 Commits (3dfb9711ed7c9bc487287930e9a4838dd5631b86)

Author SHA1 Message Date
Weblate 7cd5e75d6c Merge branch 'origin/develop' into Weblate. 2020-06-26 13:33:24 +00: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
Weblate 859c1983c7 Merge branch 'origin/develop' into Weblate. 2020-06-26 13:27:57 +00: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
Weblate 6a50159298 Merge branch 'origin/develop' into Weblate. 2020-06-26 13:26:00 +00:00
XoseM c0ad857e5c Translated using Weblate (Galician) 
Currently translated at 100.0% (2292 of 2292 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-26 13:25:59 +00: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
David Baker f4460ca78f Merge remote-tracking branch 'origin/develop' into dbkr/recovery_key_passphrase_2 2020-06-26 13:12:06 +01:00
David Baker 178cbca934 Use mask images in key entry dialogs 2020-06-26 12:56:41 +01:00
David Baker 919c3bd360 lint 2020-06-26 12:43:28 +01:00
David Baker e18ea55d20 Convert icons to masks 
so they're a sensible colour in other themes
 2020-06-26 12:41:24 +01:00
David Baker bf45cb0588 PR feedback: re-order CSS & add underscore 2020-06-26 11:24:07 +01:00
Weblate 7c6f41b3f4 Merge branch 'origin/develop' into Weblate. 2020-06-26 09:37:42 +00: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
Weblate dd461bff3c Merge branch 'origin/develop' into Weblate. 2020-06-26 09:10:24 +00: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
Weblate eb4ea114df Merge branch 'origin/develop' into Weblate. 2020-06-26 08:09:56 +00:00
aWeinzierl b16344582a Translated using Weblate (Spanish) 
Currently translated at 89.4% (2048 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-06-26 08:09:56 +00:00
XoseM 2aa791d20a Translated using Weblate (Galician) 
Currently translated at 98.1% (2247 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-26 08:09:56 +00:00
Kévin C b1b1524866 Translated using Weblate (French) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-26 08:09:49 +00: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
Weblate 150665568f Merge branch 'origin/develop' into Weblate. 2020-06-25 22:34:33 +00: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
Weblate dcb2bdadb6 Merge branch 'origin/develop' into Weblate. 2020-06-25 22:27:44 +00:00
Travis Ralston 30489ce819
Merge pull request #4840 from matrix-org/travis/room-list/resizer-2 
Iterate on the new room list resize handle
 2020-06-25 16:27:39 -06:00
Travis Ralston acf56559e1 Introduce an entirely new system for handling message preview copy 
This reverts earlier changes made to textForEvent as they are no longer needed.

This also implements an entire tree of textForEvent-like behaviour as the previews need to be different, which is easiest done with its own stack.
 2020-06-25 16:26:49 -06:00