Commit Graph

  • 1ce63f0fa7 Line 1 / 2 Support David Baker 2020-12-03 17:45:49 +00:00
  • 347365db6a Merge branch 'origin/develop' into Weblate. Weblate 2020-12-03 16:41:32 +00:00
  • 624e43823e Merge pull request #5467 from matrix-org/jryans/netlify J. Ryan Stinnett 2020-12-03 16:41:24 +00:00
  • 883d5d96a7 Nest other layers inside on automation J. Ryan Stinnett 2020-11-20 17:55:48 +00:00
  • 2102f4c4d7 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-03 16:04:38 +00:00
  • 3dfa535c8c Merge pull request #5466 from matrix-org/jryans/rebrand-ci J. Ryan Stinnett 2020-12-03 16:04:30 +00:00
  • f9426a69c9 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-03 15:50:55 +00:00
  • 52ec76158f Translated using Weblate (Persian) Hivaa 2020-12-03 15:26:43 +00:00
  • af49030b2f Merge pull request #5462 from matrix-org/travis/widget-sanity-2 Travis Ralston 2020-12-03 08:50:46 -07:00
  • 09bc38bb65 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-03 15:20:24 +00:00
  • 7d336fc4c3 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-03 15:20:20 +00:00
  • eaa4b17af4 Translated using Weblate (Persian) Hivaa 2020-12-03 15:20:01 +00:00
  • b200211660 Merge pull request #5465 from matrix-org/t3chguy/socials Michael Telatynski 2020-12-03 15:20:16 +00:00
  • fb96cbbba5 Translated using Weblate (Swedish) LinAGKar 2020-12-03 13:49:28 +00:00
  • 1e80c936c4 Merge pull request #5464 from matrix-org/t3chguy/fix/15882 Michael Telatynski 2020-12-03 15:19:58 +00:00
  • a6e69db8f5 Rebrand E2E test Docker image J. Ryan Stinnett 2020-12-03 14:56:24 +00:00
  • cdc57cf1f5 Add temporary symlink for pipeline J. Ryan Stinnett 2020-12-03 13:58:25 +00:00
  • 1fda735222 Rebrand various CI scripts and modules J. Ryan Stinnett 2020-12-03 13:56:27 +00:00
  • 1afece9a14 Fix React complaining about unknown DOM props Michael Telatynski 2020-12-03 12:20:48 +00:00
  • e4b929c6f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15882 Michael Telatynski 2020-12-03 11:42:47 +00:00
  • 7a54e91c65 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-03 11:42:44 +00:00
  • 44954ad084 Translated using Weblate (Estonian) Priit Jõerüüt 2020-12-02 22:38:45 +00:00
  • 0b94e7629d Translated using Weblate (Galician) XoseM 2020-12-03 06:42:42 +00:00
  • 7d936dea92 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-12-03 02:15:48 +00:00
  • 6772f30b51 Translated using Weblate (Portuguese (Brazil)) Marcelo Filho 2020-12-02 20:00:25 +00:00
  • 675a4b0816 Merge pull request #5463 from matrix-org/t3chguy/socials Michael Telatynski 2020-12-03 11:42:16 +00:00
  • f432d4e394 delint Michael Telatynski 2020-12-03 11:31:14 +00:00
  • 3223b00028 Jump to home page when leaving a room Michael Telatynski 2020-12-03 11:15:55 +00:00
  • 0fd9b55b95 Fix SSO buttons for Social Logins Michael Telatynski 2020-12-03 11:08:16 +00:00
  • 19d9ea3477 Merge branch 'develop' into feature-multi-language-spell-check Šimon Brandner 2020-12-03 12:06:43 +01:00
  • 24cc106d90 Merge branch 'develop' into feature-multi-language-spell-check Šimon Brandner 2020-12-03 12:04:46 +01:00
  • 62b6aa26ff Merge branch 'develop' into feature-multi-language-spell-check Šimon Brandner 2020-12-03 12:03:56 +01:00
  • b8008b5f19 Added in if statement Šimon Brandner 2020-12-03 11:50:20 +01:00
  • fa19adcfe0 Simplifie Šimon Brandner 2020-12-03 11:50:08 +01:00
  • ccc3038793 Don't exclude default Šimon Brandner 2020-12-03 08:27:18 +01:00
  • 27a853c586 use textSerialize function to get model text macekj 2020-12-02 15:01:44 -05:00
  • d38a6ad1be Add more widget sanity checking Travis Ralston 2020-12-02 12:20:59 -07:00
  • 6844c8f92e Hide spell-check settings if not using Electron Šimon Brandner 2020-12-02 20:15:00 +01:00
  • bab541a652 Hide spell-check settings if not using Electron Šimon Brandner 2020-12-02 20:14:58 +01:00
  • f7d45c38aa Merge branch 'origin/develop' into Weblate. Weblate 2020-12-02 15:48:58 +00:00
  • 5787915cb5 Translated using Weblate (Swedish) LinAGKar 2020-12-02 14:51:42 +00:00
  • a63bd875bc Merge pull request #15771 from vector-im/t3chguy/socials Michael Telatynski 2020-12-02 15:48:56 +00:00
  • a1159545c4 Merge pull request #5426 from matrix-org/t3chguy/socials Michael Telatynski 2020-12-02 15:48:48 +00:00
  • 8593845e3d i18n Michael Telatynski 2020-12-02 15:12:16 +00:00
  • 3fda7e3f46 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials Michael Telatynski 2020-12-02 15:08:13 +00:00
  • d69f2a6d44 v1.7.15-rc.1 RiotRobot 2020-12-02 15:07:44 +00:00
  • 9084a70e2e v1.7.15-rc.1 v1.7.15-rc.1 RiotRobot 2020-12-02 15:02:39 +00:00
  • 1c63db6441 Prepare changelog for v1.7.15-rc.1 RiotRobot 2020-12-02 14:45:16 +00:00
  • 1a635f6bf0 Include KaTeX CSS as a dependency J. Ryan Stinnett 2020-11-27 12:18:24 +00:00
  • ed05f9deae Merge pull request #15843 from vector-im/jryans/tweak-katex-css J. Ryan Stinnett 2020-12-02 14:52:01 +00:00
  • b4167eaeaf Upgrade matrix-react-sdk to 3.10.0-rc.1 RiotRobot 2020-12-02 14:41:28 +00:00
  • 512212b021 Upgrade matrix-js-sdk to 9.3.0-rc.1 RiotRobot 2020-12-02 14:41:03 +00:00
  • db354ff888 v3.10.0-rc.1 RiotRobot 2020-12-02 14:38:28 +00:00
  • 054dff31d5 Prepare changelog for v3.10.0-rc.1 RiotRobot 2020-12-02 14:38:28 +00:00
  • ed59b50448 Upgrade matrix-js-sdk to 9.3.0-rc.1 RiotRobot 2020-12-02 14:25:55 +00:00
  • d3b3bb42aa Merge pull request #15884 from RiotTranslateBot/weblate-element-web-element-web J. Ryan Stinnett 2020-12-02 14:04:40 +00:00
  • 2574ba1cfe Merge pull request #5461 from RiotTranslateBot/weblate-element-web-matrix-react-sdk J. Ryan Stinnett 2020-12-02 13:41:34 +00:00
  • 45dc9f697d Merge branch 'origin/develop' into Weblate. Weblate 2020-12-02 13:22:07 +00:00
  • 5c6b040983 Translated using Weblate (French) Ezwen 2020-12-02 13:05:53 +00:00
  • 80e7aa7fe6 Merge pull request #5460 from matrix-org/dbkr/something_something_dark_theme J. Ryan Stinnett 2020-12-02 13:21:56 +00:00
  • c1ed8ab377 Merge pull request #156 from vector-im/jryans/electron-10.x-rollback J. Ryan Stinnett 2020-12-02 12:22:08 +00:00
  • df1c7f2498 Revert back to the 10.x series J. Ryan Stinnett 2020-12-02 12:17:03 +00:00
  • 4a503fb32e Fix VoIP call plinth on dark theme David Baker 2020-12-02 12:14:41 +00:00
  • 31c7c05f2e Convert ConfirmCloseHostingSignupDialog to typescript Jason Robinson 2020-12-02 11:12:45 +02:00
  • 6670c727a4 Add getCanonicalAlias to mock Simon Merrick 2020-12-02 13:28:35 +13:00
  • cf8c98e076 More explicit reference checking Simon Merrick 2020-12-02 12:34:43 +13:00
  • 04001e22f9 Merge branch 'origin/develop' into Weblate. Weblate 2020-12-01 20:40:33 +00:00
  • 89eaa9654f Translated using Weblate (Arabic) Hassan Algoz 2020-12-01 09:58:58 +00:00
  • 58ed858f40 Translated using Weblate (Chinese (Simplified)) MSG-maniac 2020-12-01 09:57:54 +00:00
  • 3a3e42e439 Translated using Weblate (Russian) Nikita Epifanov 2020-12-01 19:55:29 +00:00
  • 3b9a1d90af Merge pull request #5459 from matrix-org/travis/pinned-fixes Travis Ralston 2020-12-01 13:40:09 -07:00
  • 5df6932051 Add various amounts of sanity checking for widget pinning Travis Ralston 2020-12-01 13:19:51 -07:00
  • bd1de8d45b Require a room ID for WidgetStore's pinned widget contracts Travis Ralston 2020-12-01 13:05:48 -07:00
  • db5bc0cb7a Fix formatting Šimon Brandner 2020-12-01 20:36:25 +01:00
  • 0d00f3ea6c Fix more formatting Šimon Brandner 2020-12-01 20:27:09 +01:00
  • 2ef3c8c1ab Fix formatting Šimon Brandner 2020-12-01 20:22:51 +01:00
  • 1c9d25986a Cleanup Šimon Brandner 2020-12-01 20:19:14 +01:00
  • e373c03b2a Cleanup Šimon Brandner 2020-12-01 20:19:12 +01:00
  • 3c2bb6e4f6 Cleanup Šimon Brandner 2020-12-01 20:17:24 +01:00
  • 44a363f188 Fix default value Šimon Brandner 2020-12-01 20:16:48 +01:00
  • 8287f197f4 Fix i18n Šimon Brandner 2020-12-01 19:49:31 +01:00
  • d8e46c7797 Merge remote-tracking branch 'origin/t3chguy/socials' into t3chguy/socials Michael Telatynski 2020-12-01 16:39:51 +00:00
  • e0b68441bc i18n Michael Telatynski 2020-12-01 16:39:26 +00:00
  • 111515e794 fixed linter problem nurjinn jafar 2020-12-01 17:37:28 +01:00
  • eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials Michael Telatynski 2020-12-01 16:33:29 +00:00
  • e9203d7571 Removed unnecessary imports Šimon Brandner 2020-12-01 17:21:23 +01:00
  • a6d6af1a93 Added defaults Šimon Brandner 2020-12-01 17:19:45 +01:00
  • 1bf7ff8994 null check added path to confetti fixed after refactoring nurjinn jafar 2020-12-01 17:15:02 +01:00
  • cf61d50df4 Added SpellCheckLanguagesDropdown Šimon Brandner 2020-12-01 16:59:21 +01:00
  • b207a877eb Change label Šimon Brandner 2020-12-01 16:59:02 +01:00
  • ba542f291b Merge branch 'develop' into t3chguy/socials Michael Telatynski 2020-12-01 15:50:07 +00:00
  • 31044b68d1 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui David Baker 2020-12-01 15:09:25 +00:00
  • d3b1ec0648 Revert unintentional part of 4ca35fabef David Baker 2020-12-01 15:08:59 +00:00
  • 4ca35fabef Visual tweaks David Baker 2020-12-01 13:44:24 +00:00
  • 99c13923ea Merge pull request #155 from vector-im/jryans/electron-11.0.3 J. Ryan Stinnett 2020-12-01 12:42:52 +00:00
  • 80cb503c48 Upgrade to Electron 11.0.3 J. Ryan Stinnett 2020-12-01 12:40:02 +00:00
  • 26e1cdb82c Update i18n Michael Telatynski 2020-12-01 12:04:41 +00:00
  • c03a50e34b Semiclon Jason Robinson 2020-12-01 13:51:46 +02:00
  • 8f7b012ec1 Interface syntax Jason Robinson 2020-12-01 13:50:58 +02:00
  • 85ce95e066 Interface syntax Jason Robinson 2020-12-01 13:50:42 +02:00