Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • 2733b2ad11 Merge branch 'origin/develop' into Weblate. Weblate 2021-05-11 16:47:01 +00:00
  • 040555772a Merge pull request #17239 from RiotTranslateBot/weblate-element-web-element-web J. Ryan Stinnett 2021-05-11 17:46:51 +01:00
  • ea9be0dd4c Merge pull request #6012 from matrix-org/t3chguy/fix/17238 Michael Telatynski 2021-05-11 17:46:21 +01:00
  • 7396ce76e5 Tweak the feedbacks a tad Michael Telatynski 2021-05-11 17:30:33 +01:00
  • 352937de11 Merge pull request #5996 from matrix-org/travis/voicemessages/resample2 Travis Ralston 2021-05-11 10:28:33 -06:00
  • b1d5dc1194 Merge pull request #5993 from matrix-org/travis/voicemessages/scale Travis Ralston 2021-05-11 10:25:36 -06:00
  • b1cb2b1d93 Fix bad merge Travis Ralston 2021-05-11 10:19:09 -06:00
  • d8e3458c55 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/resample2 Travis Ralston 2021-05-11 10:15:37 -06:00
  • 8d5b2d63dd Merge pull request #5995 from matrix-org/travis/voicemessages/indev Travis Ralston 2021-05-11 10:13:42 -06:00
  • 92e30f0607 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev Travis Ralston 2021-05-11 10:13:21 -06:00
  • 3b1193c1e6 Merge pull request #17204 from vector-im/travis/voicemessages/indev Travis Ralston 2021-05-11 10:12:50 -06:00
  • c00abd6add Merge pull request #17193 from vector-im/travis/voicemessages/safari Travis Ralston 2021-05-11 10:12:36 -06:00
  • d1cfde6f12 Merge pull request #5989 from matrix-org/travis/voicemessages/safari Travis Ralston 2021-05-11 10:12:31 -06:00
  • 7de626824e Sprinkle some more feedback prompts in the spaces beta Michael Telatynski 2021-05-11 17:01:31 +01:00
  • d74631a555 v1.7.28-rc.1 RiotRobot 2021-05-11 17:00:25 +01:00
  • 944bb3c717 Prepare changelog for v1.7.28-rc.1 RiotRobot 2021-05-11 17:00:25 +01:00
  • f9db77758b Merge branch 'origin/develop' into Weblate. Weblate 2021-05-11 15:48:18 +00:00
  • 5eaaf34fe2 v1.7.28-rc.1 v1.7.28-rc.1 RiotRobot 2021-05-11 16:47:53 +01:00
  • a9c43e57a8 Prepare changelog for v1.7.28-rc.1 RiotRobot 2021-05-11 16:47:53 +01:00
  • 4cb245b8d8 Upgrade matrix-react-sdk to 3.21.0-rc.1 RiotRobot 2021-05-11 16:42:44 +01:00
  • 9502a11f6d Upgrade matrix-js-sdk to 11.0.0-rc.1 RiotRobot 2021-05-11 16:41:56 +01:00
  • 392505e7a1 v3.21.0-rc.1 RiotRobot 2021-05-11 16:36:53 +01:00
  • 657481156f Prepare changelog for v3.21.0-rc.1 RiotRobot 2021-05-11 16:36:52 +01:00
  • 03bb3cc951 Merge pull request #6011 from RiotTranslateBot/weblate-element-web-matrix-react-sdk J. Ryan Stinnett 2021-05-11 16:31:41 +01:00
  • 965b0ab58d Upgrade matrix-js-sdk to 11.0.0-rc.1 RiotRobot 2021-05-11 16:28:00 +01:00
  • 350b5e37d3 Merge branch 'origin/develop' into Weblate. Weblate 2021-05-11 15:26:43 +00:00
  • bf4c8f048f Add feedback mechanism for beta features Michael Telatynski 2021-05-11 15:58:19 +01:00
  • 006aa2d5b9 Catch another instance of unlabeled avatars. Nolan Darilek 2021-05-11 09:39:06 -05:00
  • 6efc162ce9 Merge pull request #5978 from matrix-org/t3chguy/fix/17179 Michael Telatynski 2021-05-11 14:36:12 +01:00
  • 6ece4ef2ab i18n Michael Telatynski 2021-05-11 14:08:09 +01:00
  • 240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits Jaiwanth 2021-05-11 18:37:41 +05:30
  • df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 Michael Telatynski 2021-05-11 14:07:47 +01:00
  • c4118f1059 Merge pull request #5933 from matrix-org/t3chguy/fix/17021 Michael Telatynski 2021-05-11 13:58:50 +01:00
  • 2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 Michael Telatynski 2021-05-11 13:40:28 +01:00
  • 7fad439078 Merge pull request #190 from vector-im/gsouquet-windows-requirements Germain 2021-05-11 12:43:46 +01:00
  • f98d1672af Suggest installing Build tools rather than Visual Studio Germain 2021-05-11 12:41:24 +01:00
  • f0342b0ea7 Merge pull request #6009 from matrix-org/t3chguy/fix/15359 Michael Telatynski 2021-05-11 12:36:40 +01:00
  • b0f23aa65b Improve permissions error when adding new server to room directory Michael Telatynski 2021-05-11 12:20:18 +01:00
  • 834579f778 Don't render any audio non-primary feeds Šimon Brandner 2021-05-11 13:07:30 +02:00
  • 2b2e74b65e Merge pull request #6006 from matrix-org/t3chguy/fix/17227 Michael Telatynski 2021-05-11 12:02:14 +01:00
  • 5b9b878808 Translated using Weblate (French) c-cal 2021-05-10 10:33:18 +00:00
  • d998fa88e6 Translated using Weblate (Persian) Hivaa 2021-05-10 10:09:22 +00:00
  • 60e7089c77 post-merge fixes, the new keybindings stuff made it messy Michael Telatynski 2021-05-11 11:14:21 +01:00
  • 60d3da2441 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete Michael Telatynski 2021-05-11 10:59:22 +01:00
  • da1df70557 Improve comments and explainer for new decryption approach Germain Souquet 2021-05-11 10:18:53 +01:00
  • 1b877f2b7c Make SpaceTreeLevelLayoutStore into a singleton Šimon Brandner 2021-05-11 11:16:14 +02:00
  • 4115fd8695 Rewrite SpaceTreeLevelLayoutStore to save paths Šimon Brandner 2021-05-11 11:13:13 +02:00
  • 23001cb10d remove unused import Michael Telatynski 2021-05-11 10:11:51 +01:00
  • be236309c5 use arrayFastClone instead of slice Germain Souquet 2021-05-11 10:08:57 +01:00
  • 4ef7ceebe5 Merge pull request #17231 from vector-im/jryans/sanitize-upgrade J. Ryan Stinnett 2021-05-11 10:08:02 +01:00
  • de04d82395 Switch to using forms for implicit submission Michael Telatynski 2021-05-11 10:01:40 +01:00
  • 4acde37698 Merge remote-tracking branch 'origin/develop' into jryans/sanitize-upgrade J. Ryan Stinnett 2021-05-11 09:51:35 +01:00
  • f74d4769ca Merge pull request #6008 from matrix-org/jryans/upgrade-sanitize-types J. Ryan Stinnett 2021-05-11 09:49:22 +01:00
  • 49f1dd37f2 Merge remote-tracking branch 'origin/develop' into jryans/upgrade-sanitize-types J. Ryan Stinnett 2021-05-11 09:42:58 +01:00
  • f3f6bf7c8f Merge pull request #6007 from matrix-org/jryans/cheerio-upgrade J. Ryan Stinnett 2021-05-11 09:35:48 +01:00
  • 5eed9f6cba Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227 Michael Telatynski 2021-05-11 09:14:01 +01:00
  • 3e8863fc9a Adjust behaviour for the home space Jaiwanth 2021-05-11 13:00:42 +05:30
  • 965af1a642 Initial SpaceTreeLevelLayoutStore implementation Šimon Brandner 2021-05-11 08:08:02 +02:00
  • 1974d47e4e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room Jaiwanth 2021-05-11 11:24:35 +05:30
  • 87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages Jaiwanth 2021-05-11 11:12:32 +05:30
  • bc0ff5bbea Merge branch 'develop' into fix/17164/remember-collapsed-state Šimon Brandner 2021-05-11 07:38:08 +02:00
  • 4ea3fbc5ba Add comments and newlines back and resolve merge conflicts Jaiwanth 2021-05-11 11:05:54 +05:30
  • 07a952a1bb Update src/stores/SpaceStore.tsx Jaiwanth 2021-05-11 11:01:28 +05:30
  • 49bcf02db3 Merge remote-tracking branch 'upstream/develop' into https Šimon Brandner 2021-05-11 07:11:31 +02:00
  • 14f94c3883 Remove excessive null check Jaiwanth 2021-05-11 10:41:31 +05:30
  • 376befd38e Update src/components/views/rooms/EditMessageComposer.js Jaiwanth 2021-05-11 10:37:53 +05:30
  • 7ac12d14af Merge pull request #5865 from jaiwanth-v/edit-slashcommands Travis Ralston 2021-05-10 20:16:44 -06:00
  • 392cde719c Merge pull request #5940 from DantrazTrev/err Travis Ralston 2021-05-10 20:15:06 -06:00
  • 12657f0fbc Merge branch 'develop' into edit-slashcommands Travis Ralston 2021-05-10 20:09:33 -06:00
  • beef07bdef Merge branch 'develop' into err Travis Ralston 2021-05-10 20:08:19 -06:00
  • 122565b3ac Update src/components/views/rooms/EditMessageComposer.js Travis Ralston 2021-05-10 20:03:20 -06:00
  • 379d19e2e0 Lint Travis Ralston 2021-05-10 19:56:30 -06:00
  • 45424f4a3b Better words? Travis Ralston 2021-05-10 19:03:57 -06:00
  • 7efbd2d930 Hide unencrypted badge from ForwardDialog preview Robin Townsend 2021-05-10 13:57:47 -04:00
  • c39d9649ba Merge branch 'develop' into improved-forwarding-ui Robin Townsend 2021-05-10 13:38:02 -04:00
  • 503301aa89 Make rooms in ForwardDialog clickable Robin Townsend 2021-05-10 13:00:06 -04:00
  • dbd4e209d3 Switch back to release version of sanitize-html J. Ryan Stinnett 2021-05-10 15:00:56 +01:00
  • 3e68d73597 Upgrade sanitize types J. Ryan Stinnett 2021-05-10 17:43:10 +01:00
  • 7821e00bc6 Revert to internal option J. Ryan Stinnett 2021-05-10 17:36:33 +01:00
  • 17f4945323 Merge branch 'develop' into gsouquet/cache-decrypt Germain Souquet 2021-05-10 17:34:44 +01:00
  • c96f11db7d appease linter Germain Souquet 2021-05-10 17:22:33 +01:00
  • 9c8e89ff79 Fix importing J. Ryan Stinnett 2021-05-10 16:55:27 +01:00
  • 70d7a59ea2 Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1 Michael Telatynski 2021-05-10 16:26:05 +01:00
  • 95b43d1284 Merge pull request #5985 from aaronraimist/blank-device-name Michael Telatynski 2021-05-10 16:19:56 +01:00
  • bfba2b0b6f Push ForwardDialog scrollbar into the gutter Robin Townsend 2021-05-10 11:16:51 -04:00
  • f41fc7e46c Upgrade cheerio and resolve type errors J. Ryan Stinnett 2021-05-10 16:09:12 +01:00
  • c96bb374ea Allow user to progress through space setup wizard using Enter/Return Michael Telatynski 2021-05-10 16:06:23 +01:00
  • f1a6f6fd7f make breadcrumb room events decryption more idiomatic Germain Souquet 2021-05-10 15:36:59 +01:00
  • debeef6ee6 Merge branch 'master' into develop RiotRobot 2021-05-10 15:39:35 +01:00
  • 28096f3a22 v1.7.27 RiotRobot 2021-05-10 15:39:19 +01:00
  • 5efc4528a2 Prepare changelog for v1.7.27 RiotRobot 2021-05-10 15:39:19 +01:00
  • 10d5855bba Reset matrix-react-sdk back to develop branch RiotRobot 2021-05-10 15:33:40 +01:00
  • 182ec9cdb4 Reset matrix-js-sdk back to develop branch RiotRobot 2021-05-10 15:33:29 +01:00
  • c07f2e1c18 Merge branch 'master' into develop RiotRobot 2021-05-10 15:33:16 +01:00
  • 93e6abefed v1.7.27 v1.7.27 RiotRobot 2021-05-10 15:29:37 +01:00
  • fc02ecc3a1 Prepare changelog for v1.7.27 RiotRobot 2021-05-10 15:29:36 +01:00
  • 25f2859a95 Upgrade matrix-react-sdk to 3.20.0 RiotRobot 2021-05-10 15:26:39 +01:00
  • 64c44aef8e Upgrade matrix-js-sdk to 10.1.0 RiotRobot 2021-05-10 15:23:51 +01:00
  • 1b372b17e0 Reset matrix-js-sdk back to develop branch RiotRobot 2021-05-10 15:23:03 +01:00
  • 82642f17fd Resetting package fields for development RiotRobot 2021-05-10 15:22:30 +01:00