Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
69,131 Commits 1 Branch 646 Tags
develop
Commit Graph

69131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis Ralston 8d5b2d63dd Merge pull request #5995 from matrix-org/travis/voicemessages/indev 
Remove "in development" flag from voice messages
 2021-05-11 10:13:42 -06:00
Travis Ralston 92e30f0607 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev 2021-05-11 10:13:21 -06:00
Travis Ralston 3b1193c1e6 Merge pull request #17204 from vector-im/travis/voicemessages/indev 
Remove "in development" flag from voice messages labs documentation
 2021-05-11 10:12:50 -06:00
Travis Ralston c00abd6add Merge pull request #17193 from vector-im/travis/voicemessages/safari 
Add required webpack+jest config to load Safari support modules
 2021-05-11 10:12:36 -06:00
Travis Ralston d1cfde6f12 Merge pull request #5989 from matrix-org/travis/voicemessages/safari 
Support voice messages on Safari
 2021-05-11 10:12:31 -06:00
Michael Telatynski 7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +01:00
RiotRobot d74631a555 v1.7.28-rc.1 2021-05-11 17:00:25 +01:00
RiotRobot 944bb3c717 Prepare changelog for v1.7.28-rc.1 2021-05-11 17:00:25 +01:00
Weblate f9db77758b Merge branch 'origin/develop' into Weblate. 2021-05-11 15:48:18 +00:00
RiotRobot 5eaaf34fe2 v1.7.28-rc.1 v1.7.28-rc.1 2021-05-11 16:47:53 +01:00
RiotRobot a9c43e57a8 Prepare changelog for v1.7.28-rc.1 2021-05-11 16:47:53 +01:00
RiotRobot 4cb245b8d8 Upgrade matrix-react-sdk to 3.21.0-rc.1 2021-05-11 16:42:44 +01:00
RiotRobot 9502a11f6d Upgrade matrix-js-sdk to 11.0.0-rc.1 2021-05-11 16:41:56 +01:00
RiotRobot 392505e7a1 v3.21.0-rc.1 2021-05-11 16:36:53 +01:00
RiotRobot 657481156f Prepare changelog for v3.21.0-rc.1 2021-05-11 16:36:52 +01:00
J. Ryan Stinnett 03bb3cc951 Merge pull request #6011 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Translations update from Weblate
 2021-05-11 16:31:41 +01:00
RiotRobot 965b0ab58d Upgrade matrix-js-sdk to 11.0.0-rc.1 2021-05-11 16:28:00 +01:00
Weblate 350b5e37d3 Merge branch 'origin/develop' into Weblate. 2021-05-11 15:26:43 +00:00
Michael Telatynski bf4c8f048f Add feedback mechanism for beta features 2021-05-11 15:58:19 +01:00
Nolan Darilek 006aa2d5b9 Catch another instance of unlabeled avatars. 
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
 2021-05-11 09:39:06 -05:00
Michael Telatynski 6efc162ce9 Merge pull request #5978 from matrix-org/t3chguy/fix/17179 
Add disclaimer about subspaces being experimental in add existing dialog
 2021-05-11 14:36:12 +01:00
Michael Telatynski 6ece4ef2ab i18n 2021-05-11 14:08:09 +01:00
Jaiwanth 240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
Michael Telatynski df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-05-11 14:07:47 +01:00
Michael Telatynski c4118f1059 Merge pull request #5933 from matrix-org/t3chguy/fix/17021 
Spaces Beta release
 2021-05-11 13:58:50 +01:00
Michael Telatynski 2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-05-11 13:40:28 +01:00
Germain 7fad439078 Merge pull request #190 from vector-im/gsouquet-windows-requirements 2021-05-11 12:43:46 +01:00
Germain f98d1672af Suggest installing Build tools rather than Visual Studio 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-05-11 12:41:24 +01:00
Michael Telatynski f0342b0ea7 Merge pull request #6009 from matrix-org/t3chguy/fix/15359 
Improve permissions error when adding new server to room directory
 2021-05-11 12:36:40 +01:00
Michael Telatynski b0f23aa65b Improve permissions error when adding new server to room directory 2021-05-11 12:20:18 +01:00
Šimon Brandner 834579f778 Don't render any audio non-primary feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 13:07:30 +02:00
Michael Telatynski 2b2e74b65e Merge pull request #6006 from matrix-org/t3chguy/fix/17227 
Allow user to progress through space creation & setup using Enter
 2021-05-11 12:02:14 +01:00
c-cal 5b9b878808 Translated using Weblate (French) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-05-11 10:34:32 +00:00
Hivaa d998fa88e6 Translated using Weblate (Persian) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fa/
 2021-05-11 10:34:29 +00:00
Michael Telatynski 60e7089c77 post-merge fixes, the new keybindings stuff made it messy 2021-05-11 11:14:21 +01:00
Michael Telatynski 60d3da2441 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
 2021-05-11 10:59:22 +01:00
Germain Souquet da1df70557 Improve comments and explainer for new decryption approach 2021-05-11 10:18:53 +01:00
Šimon Brandner 1b877f2b7c Make SpaceTreeLevelLayoutStore into a singleton 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 11:16:14 +02:00
Šimon Brandner 4115fd8695 Rewrite SpaceTreeLevelLayoutStore to save paths 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 11:13:13 +02:00
Michael Telatynski 23001cb10d remove unused import 2021-05-11 10:11:51 +01:00
Germain Souquet be236309c5 use arrayFastClone instead of slice 2021-05-11 10:08:57 +01:00
J. Ryan Stinnett 4ef7ceebe5 Merge pull request #17231 from vector-im/jryans/sanitize-upgrade 
Switch back to release version of `sanitize-html`
 2021-05-11 10:08:02 +01:00
Michael Telatynski de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
J. Ryan Stinnett 4acde37698 Merge remote-tracking branch 'origin/develop' into jryans/sanitize-upgrade 2021-05-11 09:51:35 +01:00
J. Ryan Stinnett f74d4769ca Merge pull request #6008 from matrix-org/jryans/upgrade-sanitize-types 
Upgrade sanitize types
 2021-05-11 09:49:22 +01:00
J. Ryan Stinnett 49f1dd37f2 Merge remote-tracking branch 'origin/develop' into jryans/upgrade-sanitize-types 2021-05-11 09:42:58 +01:00
J. Ryan Stinnett f3f6bf7c8f Merge pull request #6007 from matrix-org/jryans/cheerio-upgrade 
Upgrade `cheerio` and resolve type errors
 2021-05-11 09:35:48 +01:00
Michael Telatynski 5eed9f6cba Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227 2021-05-11 09:14:01 +01:00
Jaiwanth 3e8863fc9a Adjust behaviour for the home space 2021-05-11 13:03:45 +05:30
Šimon Brandner 965af1a642 Initial SpaceTreeLevelLayoutStore implementation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 08:08:02 +02:00