2816 Commits

Author SHA1 Message Date
Michael Telatynski
0ad1f6c829
Merge remote-tracking branch 'origin/t3chguy/safeStorage' into t3chguy/safeStorage 2025-04-15 17:08:18 +01:00
Michael Telatynski
7bdd368f30
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-15 17:08:11 +01:00
Michael Telatynski
9578f7ce49
Merge branch 'develop' into t3chguy/safeStorage 2025-04-15 14:52:37 +01:00
Michael Telatynski
4826d52465
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-15 14:51:48 +01:00
Michael Telatynski
221ed97062
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-15 14:40:45 +01:00
Michael Telatynski
31868f833a
Fix nightly pass in test 2025-04-15 12:47:16 +01:00
David Baker
e02bbf80ff
Merge pull request #2231 from nbolton/print-config-path
Update config logging to specify config file path
2025-04-15 12:20:30 +01:00
David Baker
42ac29359c
nonexistent 2025-04-15 11:58:55 +01:00
David Baker
db4c544b72
Use console.log
Co-authored-by: Nick Bolton <nick@symless.com>
2025-04-15 11:54:11 +01:00
Michael Telatynski
c023ec6f69
Merge branch 'develop' of https://github.com/vector-im/element-desktop into t3chguy/safeStorage
# Conflicts:
#	.github/workflows/build_and_test.yaml
#	.github/workflows/build_linux.yaml
#	.github/workflows/build_macos.yaml
#	.github/workflows/build_test.yaml
#	.github/workflows/build_windows.yaml
2025-04-15 10:43:24 +01:00
Michael Telatynski
fca69978aa
Attempt to fix tests for Nightly builds
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-15 10:41:09 +01:00
Nick Bolton
0559886b77 Reword log line to use 'app' instead of 'global'
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2025-04-15 10:34:04 +01:00
David Baker
f59c38a07e Fix type import 2025-04-15 10:34:04 +01:00
Nick Bolton
bff9c344b6 Log when attempting to load from nonexisting JSON file 2025-04-15 10:34:04 +01:00
Nick Bolton
30a464fcdc Update config logging to specify config file path 2025-04-15 10:34:04 +01:00
Michael Telatynski
2cdf1cf3b6
Attempt to fix tests for Nightly builds
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-15 10:20:58 +01:00
Michael Telatynski
0e8785e7ac
Test release assets before deploy (#2257) 2025-04-15 08:57:28 +01:00
Michael Telatynski
a08aa8ee84
Merge branch 't3chguy/test-release-assets' of https://github.com/vector-im/element-desktop into t3chguy/safeStorage
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	.github/workflows/build_and_test.yaml
2025-04-14 16:53:06 +01:00
Michael Telatynski
50b5c8acde
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-14 15:54:45 +01:00
Michael Telatynski
b19061d8a4
Test release assets before deploy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-14 15:37:12 +01:00
Michael Telatynski
358a617050
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-14 15:24:05 +01:00
Michael Telatynski
d4d3b5ad07
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-14 15:16:23 +01:00
Michael Telatynski
08bf85faed
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-14 14:42:19 +01:00
Michael Telatynski
c59051ed02
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-14 14:26:59 +01:00
Michael Telatynski
a8d4894fdb
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 19:05:27 +01:00
Michael Telatynski
e54983ba47
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 18:48:31 +01:00
Michael Telatynski
516c436d51
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 18:21:52 +01:00
Michael Telatynski
a88f695390
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 17:53:37 +01:00
Michael Telatynski
7ea9bf1944
Fix desktop-web version matching for develop branch test CI
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 17:28:17 +01:00
Michael Telatynski
f89339577e
Merge branch 'develop' into t3chguy/safeStorage 2025-04-11 17:16:06 +01:00
Michael Telatynski
4fe0384523
Add tests for fix to getOidcCallbackUrl (#2248) 2025-04-11 16:10:11 +00:00
Michael Telatynski
a60c2d4097
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 17:06:34 +01:00
Michael Telatynski
3ead2088b1
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 16:56:40 +01:00
Michael Telatynski
600679c0f7
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 16:45:58 +01:00
Michael Telatynski
bb314423bf
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 16:25:14 +01:00
Michael Telatynski
c2e6f80efb
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 15:08:12 +01:00
Michael Telatynski
3e2dbdbd08
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 14:49:53 +01:00
Michael Telatynski
9deda3d26e
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 14:30:06 +01:00
Michael Telatynski
8919eef7c5
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 13:45:25 +01:00
Michael Telatynski
c956c87337
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 13:24:59 +01:00
Michael Telatynski
bc4b6d3949
Try password-store basic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 13:03:14 +01:00
Michael Telatynski
58a72122ee
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 09:45:27 +01:00
Michael Telatynski
a5de7792de
Use base64 as per https://github.com/electron/electron/issues/32598#issuecomment-2012694511
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 09:40:21 +01:00
Michael Telatynski
26a30ce22b
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 09:19:46 +01:00
sj
aabbb8772d
Support specifying the profile dir path via env var (#2226) (#2246) 2025-04-11 08:19:26 +00:00
Michael Telatynski
3e68efc894
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 09:15:01 +01:00
Michael Telatynski
c35ea22e1f
Merge branch 'develop' of https://github.com/vector-im/element-desktop into t3chguy/safeStorage 2025-04-11 09:07:29 +01:00
Michael Telatynski
fad6445a54
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-04-11 09:07:24 +01:00
renovate[bot]
dde93f30f4
Update electron (#2245)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-04-10 08:26:13 +01:00
RiotRobot
4486f6046e Merge branch 'master' into develop 2025-04-08 13:11:23 +00:00