Commit Graph

  • 7058196c25 Merge branch 'master' into develop RiotRobot 2021-01-18 15:26:34 +00:00
  • 1cd2ce9d34 v1.7.17 RiotRobot 2021-01-18 15:26:16 +00:00
  • 542e2c6891 Prepare changelog for v1.7.17 RiotRobot 2021-01-18 15:26:16 +00:00
  • 2ff3f2d577 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-18 15:25:22 +00:00
  • c5217b6d6d Reset matrix-react-sdk back to develop branch RiotRobot 2021-01-18 15:25:13 +00:00
  • fff8ac231e Reset matrix-js-sdk back to develop branch RiotRobot 2021-01-18 15:25:01 +00:00
  • 0f126d88ec Merge branch 'origin/develop' into Weblate. Weblate 2021-01-18 15:24:59 +00:00
  • b0fc8572ad Merge branch 'master' into develop RiotRobot 2021-01-18 15:24:48 +00:00
  • 1da652ede3 v1.7.17 v1.7.17 RiotRobot 2021-01-18 15:21:57 +00:00
  • 532caff989 Prepare changelog for v1.7.17 RiotRobot 2021-01-18 15:21:56 +00:00
  • 238ed786fd Upgrade matrix-react-sdk to 3.12.0 RiotRobot 2021-01-18 15:19:10 +00:00
  • 3275a0d819 Upgrade matrix-js-sdk to 9.5.0 RiotRobot 2021-01-18 15:18:38 +00:00
  • 72399d0047 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-18 15:16:42 +00:00
  • 6c8e6096da Reset matrix-js-sdk back to develop branch RiotRobot 2021-01-18 15:16:31 +00:00
  • 84f8817fd6 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-18 15:16:29 +00:00
  • 5455b90c98 Resetting package fields for development RiotRobot 2021-01-18 15:16:18 +00:00
  • 82d90b2567 Merge branch 'master' into develop RiotRobot 2021-01-18 15:16:17 +00:00
  • 5a54bb0e7f v3.12.0 RiotRobot 2021-01-18 15:14:53 +00:00
  • 5cf6d57883 Prepare changelog for v3.12.0 RiotRobot 2021-01-18 15:14:52 +00:00
  • c4570cdaee Upgrade matrix-js-sdk to 9.5.0 RiotRobot 2021-01-18 15:09:22 +00:00
  • 9d75a796d8 Merge branch 'release-v3.12.0' of github.com:matrix-org/matrix-react-sdk into release-v3.12.0 RiotRobot 2021-01-18 14:58:52 +00:00
  • e481bb0f5c Merge branch 'origin/develop' into Weblate. Weblate 2021-01-18 13:21:16 +00:00
  • d06ab7bc53 Translated using Weblate (Kabyle) Rachida S 2021-01-14 16:40:15 +00:00
  • b9f10a7ea2 Translated using Weblate (Albanian) Besnik Bleta 2021-01-13 16:54:37 +00:00
  • d8c01b6ffd Translated using Weblate (Lithuanian) MamasLT 2021-01-16 17:26:47 +00:00
  • 9033c57f86 Translated using Weblate (Serbian) Slobodan Simić 2021-01-17 18:44:32 +00:00
  • 6d6d4194db Translated using Weblate (Japanese) Kaede 2021-01-14 03:12:50 +00:00
  • bad65efaf2 Translated using Weblate (Polish) m4sk1n 2021-01-14 18:02:46 +00:00
  • b953e353e0 Translated using Weblate (Turkish) GokdenizK 2021-01-14 11:49:07 +00:00
  • eb8a0fc3b2 Translated using Weblate (Russian) Nikita Epifanov 2021-01-18 10:41:31 +00:00
  • 792db69f00 Translated using Weblate (Hungarian) Szimszon 2021-01-14 10:01:25 +00:00
  • 117d8843c4 Merge pull request #5454 from matrix-org/hs/bridge-info-v2 Will Hunt 2021-01-18 13:19:15 +00:00
  • e9d2daab8f fix strings Will Hunt 2021-01-18 13:09:39 +00:00
  • a9abad3cfd Merge branch 'origin/develop' into Weblate. Weblate 2021-01-18 12:10:28 +00:00
  • 4c574d63db Merge pull request #16192 from vector-im/jryans/docker-build-develop J. Ryan Stinnett 2021-01-18 12:10:23 +00:00
  • 8c98921842 Fix develop Docker builds J. Ryan Stinnett 2021-01-18 12:01:58 +00:00
  • 74b5febb9c oops strings Will Hunt 2021-01-18 11:38:06 +00:00
  • d71b2cf04f Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 Will Hunt 2021-01-18 11:36:46 +00:00
  • 461c0733d9 Revert strings Will Hunt 2021-01-18 11:35:08 +00:00
  • 1c5a234b93 Merge pull request #5547 from matrix-org/jryans/listener-overload J. Ryan Stinnett 2021-01-18 10:57:56 +00:00
  • 03ce222464 Merge pull request #165 from vector-im/bump-seshat-release J. Ryan Stinnett 2021-01-18 10:57:40 +00:00
  • 92e55ac1c1 Translated using Weblate (Serbian) Slobodan Simić 2021-01-16 21:35:02 +00:00
  • fb60ba3482 i18n Šimon Brandner 2021-01-17 16:45:29 +01:00
  • e7384f829a Made search shortcut optional Šimon Brandner 2021-01-17 16:44:29 +01:00
  • 8853508363 Added search shortcut Šimon Brandner 2021-01-17 16:36:54 +01:00
  • 2c8aaa27dd Increase width of language dropdown Ayush Kumar 2021-01-17 18:50:33 +05:30
  • 3c199d8c78 Improved language search Ayush Kumar 2021-01-17 15:18:17 +05:30
  • cb91d7037f Added search shortcut Šimon Brandner 2021-01-17 08:28:52 +01:00
  • 8bdbb5c989 Update widget-api to beta 11 Travis Ralston 2021-01-16 23:35:15 -07:00
  • f6a328a55b Update widget api Travis Ralston 2021-01-16 23:34:16 -07:00
  • ea61c979f9 Try a different string Travis Ralston 2021-01-16 23:29:27 -07:00
  • bebcabcde4 Merge branch 'develop' into travis/widget-nav Travis Ralston 2021-01-16 23:28:11 -07:00
  • c9f5c90047 Rename method Šimon Brandner 2021-01-16 16:43:47 +01:00
  • c61e41ba77 Rename setting Šimon Brandner 2021-01-16 16:37:50 +01:00
  • 9f1113b3bd Watch setting Šimon Brandner 2021-01-16 16:35:50 +01:00
  • 39984c9a34 WIP Jason Robinson 2021-01-15 17:14:55 +02:00
  • 3901cd9c72 WIP Jason Robinson 2021-01-15 17:02:28 +02:00
  • 462e0889f0 Fix lint J. Ryan Stinnett 2021-01-15 14:46:38 +00:00
  • 8a341446aa Use room-specific listeners for community prototype J. Ryan Stinnett 2021-01-15 14:34:56 +00:00
  • 729356394e Use room-specific listeners for message previews J. Ryan Stinnett 2021-01-15 13:54:38 +00:00
  • 158036ccf9 Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip Jason Robinson 2021-01-15 16:12:53 +02:00
  • 90a1c5a267 WIP Jason Robinson 2021-01-15 15:57:14 +02:00
  • 48a3154ab6 Merge pull request #5546 from matrix-org/jryans/react-warnings J. Ryan Stinnett 2021-01-15 13:55:04 +00:00
  • e80dba9414 WIP Jason Robinson 2021-01-15 15:32:30 +02:00
  • 80f3e14faf Move LoggedInView subscriptions to after mounted J. Ryan Stinnett 2021-01-15 11:42:30 +00:00
  • e90009772d Fix React warnings about missing key for edited messages J. Ryan Stinnett 2021-01-15 11:21:52 +00:00
  • 00fd261dc1 package: Bump our seshat version Damir Jelić 2021-01-15 12:18:26 +01:00
  • 2040ea2b82 Merge pull request #16157 from vector-im/jryans/sw-web-only J. Ryan Stinnett 2021-01-15 12:42:14 +00:00
  • 0bbcda09af Move into constructor J. Ryan Stinnett 2021-01-15 12:35:42 +00:00
  • e077d9ca5f Move service worker into platform J. Ryan Stinnett 2021-01-15 12:25:21 +00:00
  • 74ebc6cb22 Merge pull request #164 from vector-im/bump-seshat2 J. Ryan Stinnett 2021-01-15 11:45:31 +00:00
  • a64516483b package: Bump our seshat version Damir Jelić 2021-01-15 12:18:26 +01:00
  • 87e67d8168 Skip the service worker for Electron J. Ryan Stinnett 2021-01-15 11:05:27 +00:00
  • 266162fa32 Merge pull request #5544 from matrix-org/jryans/guest-allow-widget J. Ryan Stinnett 2021-01-14 17:50:47 +00:00
  • 97a551c04a Fix test J. Ryan Stinnett 2021-01-14 17:39:58 +00:00
  • 6d932e1352 Fix lint errors J. Ryan Stinnett 2021-01-14 17:38:06 +00:00
  • accbe78d9a Add null path J. Ryan Stinnett 2021-01-14 17:37:18 +00:00
  • 658a8dfa99 Use device storage for allowed widgets if account data not supported J. Ryan Stinnett 2021-01-14 17:30:25 +00:00
  • cb66f7493b Skip account settings for guest users J. Ryan Stinnett 2021-01-14 15:58:26 +00:00
  • eca8ef3b35 Update thumbnails Šimon Brandner 2021-01-14 12:44:48 +01:00
  • d6af5b3bbd WIP minimize Jason Robinson 2021-01-14 12:20:42 +02:00
  • d4a58bdb2a WIP minimize Jason Robinson 2021-01-14 11:53:20 +02:00
  • 8f91b04eb3 Use contextBridge Šimon Brandner 2021-01-14 08:35:04 +01:00
  • 44c8f2c30f Merge 'upstream/develop' and use contextBridge Šimon Brandner 2021-01-14 08:31:52 +01:00
  • b2850e11db Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing Šimon Brandner 2021-01-13 19:47:07 +01:00
  • 35965aa276 Merge pull request #5543 from matrix-org/dbkr/fix_incoming_call_dark_theme_rel David Baker 2021-01-13 18:02:46 +00:00
  • 7f51553723 Merge pull request #5542 from matrix-org/dbkr/fix_incoming_call_dark_theme David Baker 2021-01-13 17:06:22 +00:00
  • 1b98ada55f Actually this is right colour David Baker 2021-01-13 16:55:38 +00:00
  • d4470d2ed2 Actually this is right colour David Baker 2021-01-13 16:55:38 +00:00
  • 0e14dc06fb Merge pull request #16137 from vector-im/jryans/context-isolation J. Ryan Stinnett 2021-01-13 16:50:33 +00:00
  • faa217c767 Merge pull request #163 from vector-im/jryans/context-isolation J. Ryan Stinnett 2021-01-13 16:50:26 +00:00
  • 604b9378ce Merge pull request #5541 from matrix-org/dbkr/dmroommap_ts David Baker 2021-01-13 16:23:30 +00:00
  • 6371a4abd1 Fix tests David Baker 2021-01-13 16:02:35 +00:00
  • 008fdf8dfb Missed some underscores David Baker 2021-01-13 15:44:33 +00:00
  • 58eca1aa7d Use isolated IPC API J. Ryan Stinnett 2021-01-13 15:39:18 +00:00
  • 28fe6291d9 add public/privates & de-underscore David Baker 2021-01-13 15:37:49 +00:00
  • 20283eabe0 Fix incoming call box on dark theme David Baker 2021-01-13 15:31:26 +00:00
  • 150e8c9d56 Fix incoming call box on dark theme David Baker 2021-01-13 15:31:26 +00:00
  • 5ad0967b07 Enable context isolation, bridge expected IPC J. Ryan Stinnett 2021-01-13 15:21:00 +00:00
  • ea31d5821b Unintnetional commit (again) David Baker 2021-01-13 14:54:12 +00:00