69131 Commits

Author SHA1 Message Date
Michael Telatynski ef2dcaea3d Merge pull request #6250 from matrix-org/t3chguy/fix/16843 2021-06-23 16:22:26 +01:00
J. Ryan Stinnett f63436a2cb Send the current arch when updating
This depends on further builder changes to actually place updates at this new
location for both architectures.
2021-06-23 16:18:10 +01:00
J. Ryan Stinnett c5dd6195f2 Fix copy command log 2021-06-23 16:18:10 +01:00
J. Ryan Stinnett c3a36bb17d Cross-compile matrix-seshat for aarch64-apple-darwin 2021-06-23 16:18:09 +01:00
J. Ryan Stinnett f3c1db3313 Cross-compile SQLCipher for aarch64-apple-darwin 2021-06-23 16:18:09 +01:00
J. Ryan Stinnett c57a173649 Check for Rust host and target support 2021-06-23 16:18:09 +01:00
J. Ryan Stinnett 48dc1ab396 Print rejections that reach the root handler 2021-06-23 16:18:09 +01:00
J. Ryan Stinnett 997f2c21bf Use targets in hak environment for cross-compiling
This arranges the hak environment target info around target IDs that come from
the builder, which simplifies cross-compiling. The `target.js` module is a
generated copy of the builder's `target.ts`.
2021-06-23 16:18:09 +01:00
J. Ryan Stinnett a171fa417b Borrow target definition from electron-builder
A bit hacky, but for now we paste in the JS generated version of the builder's
`target.ts` module. It's quite unlikely to change often, so this is perhaps
enough for now.
2021-06-23 16:18:09 +01:00
J. Ryan Stinnett 115f25165a Rename hak target to runtime version
The hak environment's `target` is more like a runtime version, so this renames
to call it that, especially since we're about to add more traditional target
strings. `npm_config_target` remains, since that's what `npm` expects.
2021-06-23 16:18:09 +01:00
J. Ryan Stinnett c1ca909c7c Limit macOS updates to x86_64 temporarily
As a temporary measure, this limits the updater on macOS to only supporting the
`x86_64` / `x64` architecture. This ensures `aarch64` users are not
inadvertently kicked back to `x86_64`.
2021-06-23 16:18:09 +01:00
Michael Telatynski 5d93216c94 Decrease e2e shield fill mask size so that it doesn't overlap 2021-06-23 16:10:47 +01:00
Šimon Brandner b7a821a9e4 .tsx can also be tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:13 +02:00
Šimon Brandner 0df6200dd0 Convert MemberList-test to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:13 +02:00
Šimon Brandner 99c442cea7 Convert MemberList to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:06 +02:00
Travis Ralston f28a37aba5 Merge pull request #17742 from vector-im/jaywink/tiny-whitespace-fix
Fix whitespace in Dockerfile
2021-06-23 08:00:03 -06:00
Michael Telatynski e2a109667a Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/5.1
 Conflicts:
	src/vector/platform/ElectronPlatform.tsx
2021-06-23 14:54:06 +01:00
Michael Telatynski a8dfc4488f Convert more of js-sdk crypto and fix underscored field accesses 2021-06-23 14:47:24 +01:00
Jason Robinson 26380719a1 Fix whitespace in Dockerfile
Upstreamed whitespace fix from a fork, to be aligned with the other indented line :)
2021-06-23 15:42:30 +03:00
Michael Telatynski 73b7610228 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5.1 2021-06-23 13:05:21 +01:00
Michael Telatynski cdb97d5494 Fix trashcan.svg by exporting it with its viewbox
then fix sizing and alignment of consumers
2021-06-23 12:30:23 +01:00
David Baker f0ad70f0e7 Merge pull request #5786 from DantrazTrev/DialPad
Dial Pad UI bug fixes
2021-06-23 11:41:41 +01:00
Michael Telatynski 1fe1288427 Merge pull request #6247 from SimonBrandner/feature/media-device-handler 2021-06-23 11:10:09 +01:00
Šimon Brandner 4ab9758b67 log -> warn
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:43:49 +02:00
Šimon Brandner 0e582c425c Make this look nicer
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-23 10:42:19 +02:00
Šimon Brandner 1bef985d46 Remove emmiting that isn't useful for us now
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:39:10 +02:00
Šimon Brandner 95624b3fa6 Add some docs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:37:15 +02:00
Germain Souquet a6367c0796 Reintroduce LiveRecording components for maintenance reasons 2021-06-23 09:33:38 +01:00
Šimon Brandner 6c9e0e54e9 Iterate PR
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:27:51 +02:00
Šimon Brandner 58151d71c5 Handle mid-call output changes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:09:53 +02:00
Germain 35b8f79fbd Merge pull request #6228 from matrix-org/gsouquet/fix-17673 2021-06-23 09:08:43 +01:00
Germain bca19783fa Merge pull request #6246 from matrix-org/gsouquet/fix-dependencies-mismatch
Fix dependency and lockfile mismatch
2021-06-23 09:03:15 +01:00
Germain Souquet 057f46ad9d fix dependency and lockfile mismatch 2021-06-23 08:44:48 +01:00
Šimon Brandner 9bceb40820 CallMediaHandler -> MediaDeviceHandler
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 09:26:33 +02:00
Jaiwanth 5fff64f128 Fix types 2021-06-23 12:14:20 +05:30
Jaiwanth b2162c3be9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-23 12:09:46 +05:30
Jaiwanth 438b9d4730 Get rid of jszip and replace it with a custom library 2021-06-23 11:58:50 +05:30
Aaron Raimist 9d723cd1b6 lint
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-22 22:48:04 -05:00
Aaron Raimist 38d0ab3c44 Do not honor string power levels
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-22 22:35:59 -05:00
Travis Ralston 759a4e796f Merge pull request #6234 from SimonBrandner/fix/room-dir-click/13751
Improve room directory click behaviour
2021-06-22 19:44:20 -06:00
Travis Ralston f61370505b Merge pull request #203 from dogancelik/numpad-zoom
Add numpad accelerators for zooming
2021-06-22 19:42:49 -06:00
Michael Telatynski d5581f00cc Merge pull request #6239 from matrix-org/t3chguy/fix/17605 2021-06-22 22:56:49 +01:00
Michael Telatynski 50a5c03730 Merge pull request #6151 from matrix-org/t3chguy/fix/17244 2021-06-22 22:52:33 +01:00
Michael Telatynski 2a3b92f7d7 Merge pull request #6244 from matrix-org/t3chguy/fix/17368
Hide communities invites and the community autocompleter when Spaces on
2021-06-22 22:50:28 +01:00
Michael Telatynski 9f20d6661d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17605
 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
2021-06-22 22:49:28 +01:00
Michael Telatynski e4542e13d9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 2021-06-22 22:42:59 +01:00
Michael Telatynski 24b03366a8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17368 2021-06-22 22:40:59 +01:00
Michael Telatynski bbdc28f56d Merge pull request #6241 from matrix-org/t3chguy/ts/7 2021-06-22 22:34:15 +01:00
Michael Telatynski ffaa19ef2c fix typing 2021-06-22 22:27:12 +01:00
Michael Telatynski e0ac200e27 Iterate PR 2021-06-22 22:23:09 +01:00