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

Commit Graph

  • 02ffbd6f32 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 22:58:16 +00:00
  • c41f164c75 Merge pull request #15912 from vector-im/travis/semicolon Travis Ralston 2020-12-07 15:58:07 -07:00
  • 4ee261fc08 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 22:37:39 +00:00
  • 603a1c8ffb Fix linter Travis Ralston 2020-12-07 15:37:26 -07:00
  • 23b29fdefb Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 22:13:59 +00:00
  • 87dbc82a9f Merge branch 'feature_confetti#14676' into develop Travis Ralston 2020-12-07 15:12:45 -07:00
  • 550a5220d9 Undocumented linter cleanup Travis Ralston 2020-12-07 15:12:26 -07:00
  • 2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 Travis Ralston 2020-12-07 14:58:56 -07:00
  • e64ca0e1ff Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 21:51:42 +00:00
  • ad0ab079fd Translated using Weblate (Estonian) Priit Jõerüüt 2020-12-07 21:06:15 +00:00
  • cffeb940a5 Translated using Weblate (Japanese) Kaede 2020-12-07 20:39:02 +00:00
  • 1da90ea5dc Translated using Weblate (Portuguese (Brazil)) Marcelo Filho 2020-12-07 21:17:00 +00:00
  • f5ce50a472 Merge pull request #5391 from su-ex/fix-inverted-settings-default Travis Ralston 2020-12-07 14:51:28 -07:00
  • d0b9b211c9 Fix an important semicolon Travis Ralston 2020-12-07 14:46:56 -07:00
  • 93a34e7e96 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 20:08:25 +00:00
  • d90e2db68c Translated using Weblate (Italian) random 2020-12-07 16:00:51 +00:00
  • 47e31ab06f Translated using Weblate (Swedish) LinAGKar 2020-12-07 19:36:18 +00:00
  • 89d5d88ca4 Translated using Weblate (Portuguese (Brazil)) Marcelo Filho 2020-12-07 18:46:01 +00:00
  • 14600adf66 Merge pull request #5474 from matrix-org/t3chguy/socials Michael Telatynski 2020-12-07 20:08:04 +00:00
  • b9d70cb1a3 Fix indentation David Baker 2020-12-07 18:40:29 +00:00
  • 365d6982ce Add secondary call avatar to main voice content view David Baker 2020-12-07 18:28:43 +00:00
  • 8a58c9dea0 Update UI for two calls in the PiP view David Baker 2020-12-07 17:56:36 +00:00
  • 747d743bd0 Add 60% opacity black over the avatars when on hold David Baker 2020-12-07 16:22:57 +00:00
  • 499f7e8af7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials Michael Telatynski 2020-12-07 16:08:11 +00:00
  • d06a00bcce Improve usability of the Server Picker Dialog Michael Telatynski 2020-12-07 16:05:41 +00:00
  • 3b25a3be98 Smaller avatar, more padding on text David Baker 2020-12-07 15:42:35 +00:00
  • c7f1d97b1a Round off the sharp corners David Baker 2020-12-07 15:38:55 +00:00
  • 2d54c7512f Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 14:35:37 +00:00
  • 52ada641ba Merge pull request #5473 from schwukas/fixed-typos Michael Telatynski 2020-12-07 14:35:30 +00:00
  • 9bb04a857b Add generated i18n json Lukas 2020-12-07 15:21:31 +01:00
  • ed255e48f9 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 13:06:08 +00:00
  • 79303ec387 Merge remote-tracking branch 'origin/develop' into develop RiotRobot 2020-12-07 13:05:47 +00:00
  • ed00cfada3 Merge branch 'master' into develop RiotRobot 2020-12-07 13:05:07 +00:00
  • 3a660b2461 v1.7.15 RiotRobot 2020-12-07 13:04:50 +00:00
  • c6bbff5ffe Prepare changelog for v1.7.15 RiotRobot 2020-12-07 13:04:50 +00:00
  • 3360f02ed9 Reset matrix-react-sdk back to develop branch RiotRobot 2020-12-07 13:01:39 +00:00
  • c4fa2d2585 Reset matrix-js-sdk back to develop branch RiotRobot 2020-12-07 13:01:29 +00:00
  • c4545341ea Merge branch 'master' into develop RiotRobot 2020-12-07 13:00:45 +00:00
  • 80b85b6b84 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 12:58:27 +00:00
  • 07a1754768 Merge pull request #5472 from matrix-org/dependabot/npm_and_yarn/highlight.js-10.4.1 J. Ryan Stinnett 2020-12-07 12:58:21 +00:00
  • ef839c45a7 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 12:58:09 +00:00
  • 9a8f9307fe Translated using Weblate (French) Jeanne Lavoie 2020-12-06 20:55:24 +00:00
  • a991156608 Merge pull request #15898 from vector-im/dependabot/npm_and_yarn/highlight.js-10.4.1 J. Ryan Stinnett 2020-12-07 12:58:01 +00:00
  • 1b481c2a13 v1.7.15 v1.7.15 origin/release-v1.7.15 RiotRobot 2020-12-07 12:54:59 +00:00
  • 44fefec9ea Prepare changelog for v1.7.15 RiotRobot 2020-12-07 12:54:58 +00:00
  • 110f4dc907 Upgrade matrix-react-sdk to 3.10.0 RiotRobot 2020-12-07 12:36:01 +00:00
  • dab75ec0c2 Upgrade matrix-js-sdk to 9.3.0 RiotRobot 2020-12-07 12:34:41 +00:00
  • 0fe5afa756 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 12:33:28 +00:00
  • 7d41604569 Reset matrix-js-sdk back to develop branch RiotRobot 2020-12-07 12:33:18 +00:00
  • ed075c7a6d Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 12:32:31 +00:00
  • 6360bc7a01 Merge branch 'master' into develop RiotRobot 2020-12-07 12:32:20 +00:00
  • fefe84d101 v3.10.0 RiotRobot 2020-12-07 12:31:08 +00:00
  • ae835fb8a9 Prepare changelog for v3.10.0 RiotRobot 2020-12-07 12:31:07 +00:00
  • 1241b7c335 Upgrade matrix-js-sdk to 9.3.0 RiotRobot 2020-12-07 12:13:04 +00:00
  • 0747d49912 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-07 10:19:12 +00:00
  • 51ededb94d Translated using Weblate (Estonian) Priit Jõerüüt 2020-12-04 20:47:10 +00:00
  • 81c16555f6 Translated using Weblate (Galician) XoseM 2020-12-05 05:49:10 +00:00
  • 5178d335ec Translated using Weblate (Czech) Tirifto 2020-12-06 20:45:09 +00:00
  • fdeeb26cbe Translated using Weblate (Czech) waclaw66 2020-12-06 21:03:16 +00:00
  • 5cee82f9d5 Translated using Weblate (Czech) Stanislav Lukeš 2020-12-06 21:11:37 +00:00
  • c491ac6e29 Translated using Weblate (Japanese) Kaede 2020-12-06 16:37:52 +00:00
  • ed10693fed Translated using Weblate (Ukrainian) strix aluco 2020-12-07 04:42:26 +00:00
  • df3fd6baa9 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-12-06 11:56:17 +00:00
  • 1d1cef97b2 Translated using Weblate (Swedish) LinAGKar 2020-12-07 07:49:29 +00:00
  • 88cd776926 Translated using Weblate (Portuguese (Brazil)) Marcelo Filho 2020-12-05 20:40:02 +00:00
  • de7f2ab2e0 Translated using Weblate (German) schwukas 2020-12-06 08:42:08 +00:00
  • d967f01055 Merge pull request #5471 from matrix-org/jryans/rm-temp-test-sl J. Ryan Stinnett 2020-12-07 10:18:31 +00:00
  • b365d3b27e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink Simon Merrick 2020-12-07 10:30:50 +13:00
  • c67906c3c6 Translated using Weblate (French) Salamandar 2020-12-06 20:55:11 +00:00
  • 5544ee6408 extract alias handling to separate function Simon Merrick 2020-12-06 23:29:11 +13:00
  • a856484139 Fix typos in some strings Lukas 2020-12-06 10:32:52 +01:00
  • 32f7e3552c Remove globally defined flex and set just for group queries Aaron Raimist 2020-12-05 21:56:10 -06:00
  • 3ec9d93cb0 Merge branch 'develop' into searchbox-fix-width Aaron Raimist 2020-12-05 19:53:08 -06:00
  • ab71547c4c Don't let call room names push out their containers David Baker 2020-12-04 20:36:08 +00:00
  • 4c50125e9d Don't remove call when we call hangup David Baker 2020-12-04 20:22:01 +00:00
  • faf2922b1b Update video element when the call changes in a videoview David Baker 2020-12-04 19:41:48 +00:00
  • aed9721936 Bump highlight.js from 10.1.2 to 10.4.1 dependabot[bot] 2020-12-04 17:36:22 +00:00
  • 58eaccbba8 Bump highlight.js from 10.1.2 to 10.4.1 dependabot[bot] 2020-12-04 17:35:40 +00:00
  • 0c85cb587d Merge branch 'develop' into emoji_quick_shortcut macekj 2020-12-04 11:05:50 -05:00
  • 7bc766e33c Merge branch 'origin/develop' into Weblate. Weblate 2020-12-04 15:13:58 +00:00
  • 0f1f3d4338 Translated using Weblate (Estonian) Priit Jõerüüt 2020-12-03 22:09:24 +00:00
  • 5acb81aa44 Translated using Weblate (Albanian) Besnik Bleta 2020-12-04 09:56:40 +00:00
  • c13891c670 Merge pull request #5260 from orangecms/redact-with-reason J. Ryan Stinnett 2020-12-04 15:13:40 +00:00
  • 344363d29d Merge pull request #15894 from vector-im/jryans/add-gitter J. Ryan Stinnett 2020-12-04 11:17:07 +00:00
  • fa8aef94af Merge pull request #157 from vector-im/jryans/add-gitter J. Ryan Stinnett 2020-12-04 11:06:23 +00:00
  • c63c8540f1 Remove old app test script path J. Ryan Stinnett 2020-12-04 11:05:01 +00:00
  • b7c31f17b5 Add gitter.im to room directory J. Ryan Stinnett 2020-12-04 11:01:33 +00:00
  • aef2ffb01b Add gitter.im to room directory J. Ryan Stinnett 2020-12-04 11:00:38 +00:00
  • 72f858b5bb Empty commit David Baker 2020-12-03 19:28:37 +00:00
  • 6222ae07ac Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui David Baker 2020-12-03 19:05:21 +00:00
  • 02d1249cfc Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 David Baker 2020-12-03 19:01:54 +00:00
  • 0b3c7e0972 revert 2 testing commits to replace with real commit from develop David Baker 2020-12-03 19:00:57 +00:00
  • fc992e99e1 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-03 19:00:10 +00:00
  • 0154c5aef1 Merge pull request #5469 from matrix-org/dbkr/fetchdep_netlify David Baker 2020-12-03 19:00:03 +00:00
  • c853085e29 Add support for Netlify to fetchdep script David Baker 2020-12-03 18:40:33 +00:00
  • 1ed5fb1f30 Try another variable David Baker 2020-12-03 18:29:23 +00:00
  • a8a4d44a57 Try different branch variable to try & get netlify to work David Baker 2020-12-03 18:24:19 +00:00
  • 6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui David Baker 2020-12-03 17:57:22 +00:00
  • 0b15ab06d8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 David Baker 2020-12-03 17:56:39 +00:00
  • 482c0a2f6a i18n David Baker 2020-12-03 17:49:22 +00:00