fogelito
98a6b96af9
Hardcode size and orders
2024-02-08 15:01:20 +02:00
Jake Barnby
63e91cb3f3
Merge remote-tracking branch 'origin/1.5.x' into fix-password-version-enum-name
...
# Conflicts:
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
2024-02-08 19:40:57 +13:00
Jake Barnby
9eaa0fff86
Merge remote-tracking branch 'origin/1.5.x' into fix-template-enum-seperation
...
# Conflicts:
# app/config/specs/open-api3-latest-console.json
# app/config/specs/swagger2-latest-console.json
2024-02-08 19:24:21 +13:00
Steven Nguyen
4ace8ed027
Replace catching \Exception with \Throwable
...
\Exception doesn't work as a catch-all because not everything extends
\Exception. For example, there was a problem where the messaging worker
didn't catch an exception here:
} catch (\Exception $e) {
$deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
} finally {
As such, $deliveryErrors stayed as an empty array. In this case, the
$adapter->send() threw a TypeError which extends Error which implements
Throwable. Updating the catch to catch \Throwable ensures the error is
caught and $deliveryErrors gets updated.
2024-02-08 01:17:54 +00:00
Jake Barnby
df60ee9e72
Fix SHA function enum name
2024-02-08 00:17:38 +13:00
Jake Barnby
66a38898eb
Fix message status values and enums
2024-02-07 23:50:05 +13:00
Jake Barnby
4a45927af9
Fix email/sms template type enums getting the same values
2024-02-07 23:03:59 +13:00
Jake Barnby
7014b2c2cd
Fix user API mfa route auth
2024-02-07 18:08:51 +13:00
Bradley Schofield
559fa924c0
Merge branch '1.5.x' into 1.5.x-response-request-models
2024-02-06 17:10:43 +00:00
Jake Barnby
987b02083c
Array instead of JSON
2024-02-06 02:22:25 +13:00
Jake Barnby
0a72b37b3e
Fix session response model
2024-02-06 02:17:04 +13:00
Jake Barnby
28ae550853
Update console to 1.5.x
2024-02-06 01:57:38 +13:00
Christy Jacob
ad9cc748a5
Merge pull request #7471 from appwrite/fix-empty-user-updates
...
Fix: Empty values in PATCH of users
2024-02-05 15:54:40 +04:00
Jake Barnby
7ce01deec3
Fix console enum specs
2024-02-06 00:39:52 +13:00
Matej Bačo
25f8702429
Fix formatting
2024-02-05 10:40:53 +00:00
Matej Bačo
7beb9080fa
Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates
2024-02-05 10:38:48 +00:00
Khushboo Verma
e8523e38f7
Merge branch '1.5.x' into feat-block-countries
2024-02-05 13:26:52 +05:30
Jake Barnby
15f433794f
Add missing enum cases
2024-02-05 20:25:34 +13:00
Jake Barnby
c193260335
Fix usage enums
2024-02-05 19:32:05 +13:00
shimon
af2b640948
updates
2024-02-04 10:33:04 +02:00
shimon
a63977455f
Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
...
Conflicts:
.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby
bb9947bfd3
Remove invalid injection
2024-02-04 04:15:16 +13:00
Jake Barnby
68931c8672
Merge pull request #7538 from appwrite/fix-spec-generation
...
Fix spec generation
2024-02-03 04:04:00 +13:00
Jake Barnby
94d82c75c0
Update specs
2024-02-03 03:41:23 +13:00
Jake Barnby
f14c0cc0aa
Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
2024-02-03 03:35:14 +13:00
Khushboo Verma
d40a51b50a
Only disallow console requests
2024-02-02 20:01:54 +05:30
Jake Barnby
3816870e19
Fix duplicate routes
2024-02-03 03:26:04 +13:00
Jake Barnby
874e483fb5
Trigger delete of targets associated with sessions when sessions are deleted
2024-02-03 03:06:36 +13:00
Jake Barnby
465bc81071
Add deletes job to delete targets tied to a particular session
2024-02-03 03:06:31 +13:00
Jake Barnby
38f93a3e89
Add session ID + internal ID to targets
2024-02-03 03:06:23 +13:00
Khushboo Verma
52c9109685
Improve error message
2024-02-02 19:35:35 +05:30
Khushboo Verma
7b4f334f31
Update error message
2024-02-02 19:30:54 +05:30
Torsten Dittmann
b462eee183
chore: run formatter
2024-02-02 13:50:41 +01:00
Torsten Dittmann
a77526cab1
fix: backup codes
2024-02-02 13:50:18 +01:00
Torsten Dittmann
db321db0fb
fix: code review
2024-02-02 13:42:15 +01:00
Torsten Dittmann
75fc59931a
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-02-02 13:30:11 +01:00
Jake Barnby
0e8e455903
Fix spec generation
2024-02-02 23:54:34 +13:00
Jake Barnby
01d92d3125
Merge pull request #7526 from appwrite/feat-update-containers
...
Update containers
2024-02-02 22:23:11 +13:00
Jake Barnby
df3042dc55
Merge pull request #7536 from appwrite/fix-invalid-usage-labels
...
Remove redundant usage labels
2024-02-02 22:21:20 +13:00
Khushboo Verma
d96d84201e
Add auth group to create email token endpoint
2024-02-02 14:03:20 +05:30
Khushboo Verma
0ea7b28a6b
Resolve merge conflicts
2024-02-02 12:53:25 +05:30
Jake Barnby
499f0a53ea
Update to standard namespacing for enums
2024-02-02 17:53:19 +13:00
Jake Barnby
d1bad7c3cd
Remove redundant usage labels
2024-02-02 17:16:31 +13:00
shimon
a254bb7edb
Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
2024-02-01 17:13:38 +02:00
Eldad A. Fux
321a998947
Merge pull request #7533 from appwrite/feat-rename-security-phrases
...
Feat: Rename security phrases
2024-02-01 15:45:15 +01:00
Matej Bačo
ef3f7878dc
PR review changes
2024-02-01 14:13:30 +00:00
Khushboo Verma
d3b002a48e
Merge branch '1.5.x' into feat-block-countries
2024-02-01 17:49:14 +05:30
Khushboo Verma
851e5c5154
Remove restrict group and add logic to auth group
2024-02-01 17:40:41 +05:30
Torsten Dittmann
ceb868c9d7
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-02-01 11:57:32 +01:00
loks0n
5e26f01ecd
chore: fix account get ssr
2024-02-01 10:41:41 +00:00
Matej Bačo
a47a4240ed
Rename security phrases
2024-02-01 10:41:01 +00:00
shimon
350d72eb1f
updates
2024-02-01 12:21:50 +02:00
loks0n
d84cfab244
feat: remove users.createSession
2024-02-01 10:21:38 +00:00
Jake Barnby
d306732b31
Merge branch '1.5.x' into feat-update-containers
2024-02-01 21:34:23 +13:00
Jake Barnby
21f0ce5b82
Set port, username and password to defaults if not provided
2024-02-01 17:45:41 +13:00
Jake Barnby
a6b5734884
Fix encryption type options
2024-02-01 17:44:42 +13:00
Jake Barnby
acc7131c95
Remove redundant key existence check
2024-02-01 17:42:19 +13:00
Jake Barnby
19fdc193b6
Fix credential enabled check
2024-02-01 17:41:24 +13:00
shimon
c58d6ea418
sync against main
2024-01-31 20:31:16 +02:00
shimon
f477be7521
Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
...
Conflicts:
composer.json
2024-01-31 20:28:03 +02:00
shimon
3f1850f4a7
Merge remote-tracking branch 'origin/1.5.x-response-request-models' into 1.5.x-response-request-models
...
# Conflicts:
# Dockerfile
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# app/controllers/api/account.php
# app/controllers/api/users.php
# app/controllers/shared/api.php
# composer.lock
# src/Appwrite/Migration/Version/V20.php
# src/Appwrite/Platform/Services/Tasks.php
# src/Appwrite/Platform/Services/Workers.php
# src/Appwrite/Platform/Workers/Builds.php
# src/Appwrite/Platform/Workers/Deletes.php
# src/Appwrite/Platform/Workers/Mails.php
2024-01-31 20:25:12 +02:00
shimon
102c86b2a6
Merge branch 'main' of github.com:appwrite/appwrite into 1.5.x-response-request-models
...
Conflicts:
Dockerfile
app/config/specs/open-api3-latest-client.json
app/config/specs/open-api3-latest-console.json
app/config/specs/open-api3-latest-server.json
app/config/specs/swagger2-latest-client.json
app/config/specs/swagger2-latest-console.json
app/config/specs/swagger2-latest-server.json
app/controllers/api/account.php
app/controllers/api/users.php
app/controllers/shared/api.php
app/worker.php
composer.json
composer.lock
src/Appwrite/Event/Mail.php
src/Appwrite/Migration/Migration.php
src/Appwrite/Migration/Version/V20.php
src/Appwrite/Platform/Services/Tasks.php
src/Appwrite/Platform/Services/Workers.php
src/Appwrite/Platform/Workers/Builds.php
src/Appwrite/Platform/Workers/Deletes.php
src/Appwrite/Platform/Workers/Mails.php
2024-01-31 20:21:18 +02:00
Jake Barnby
9051c31a02
Update traefik, mariadb, redis containers
2024-02-01 02:36:35 +13:00
Jake Barnby
d275d36a0b
Fix param order
2024-02-01 02:33:14 +13:00
Jake Barnby
e4194c690f
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-provider
...
# Conflicts:
# composer.lock
2024-02-01 01:50:36 +13:00
Jake Barnby
49a753509b
Merge pull request #7067 from appwrite/feat-php-8-1
...
Upgrade to PHP 8.2
2024-02-01 01:47:57 +13:00
Jake Barnby
d9f53cacfa
Add SMTP provider
2024-02-01 01:30:09 +13:00
Jake Barnby
39312a83ef
Merge pull request #7518 from appwrite/feat-remove-description
...
Feat remove description
2024-02-01 00:33:49 +13:00
Jake Barnby
79c324527e
Merge pull request #7510 from appwrite/feat-delete-message
...
Add message delete route
2024-01-31 19:55:11 +13:00
Khushboo Verma
dadb94c499
Merge branch '1.5.x' into feat-block-countries
2024-01-31 12:24:21 +05:30
Khushboo Verma
1d2eadf7e0
Allow 451 error publicly
2024-01-31 12:23:45 +05:30
Torsten Dittmann
3f688a2aa7
fix: remove some leftovers
2024-01-30 16:09:58 +01:00
Jake Barnby
ee4b50ce51
Merge pull request #7504 from appwrite/labels-limit
...
Labels limit
2024-01-30 19:43:32 +13:00
Jake Barnby
ab0fae216d
Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1
...
# Conflicts:
# composer.lock
2024-01-30 18:44:16 +13:00
Jake Barnby
d7c9f9df59
Merge remote-tracking branch 'origin/1.5.x' into feat-remove-description
2024-01-30 16:58:20 +13:00
Jake Barnby
14a279eb57
Merge remote-tracking branch 'origin/1.5.x' into feat-delete-message
2024-01-30 16:58:04 +13:00
Jake Barnby
afb32b49d5
Throw if status still scheduled and scheduled time before now
2024-01-30 16:33:18 +13:00
Khushboo Verma
2f88320d4f
Add null check
2024-01-29 18:47:14 +05:30
Khushboo Verma
f4426d553c
Throw 451 exception
2024-01-29 16:49:13 +05:30
Khushboo Verma
4cd5999bb3
Merge branch '1.5.x' into feat-block-countries
2024-01-29 16:25:31 +05:30
fogelito
53efc930c0
Remove Database::INDEX_ARRAY
2024-01-29 08:58:11 +02:00
fogelito
9c8c017618
Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
...
Conflicts:
app/controllers/api/databases.php
app/controllers/api/projects.php
app/controllers/api/users.php
composer.json
composer.lock
2024-01-29 08:50:53 +02:00
Jake Barnby
61dd4a123c
Remove descriptions
2024-01-29 19:29:58 +13:00
Jake Barnby
d94962f086
Add message delete route
2024-01-29 17:20:45 +13:00
fogelito
974783f54a
Increase labels max value
2024-01-28 12:51:05 +02:00
fogelito
789e19d26a
Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
2024-01-25 19:06:18 +02:00
Jake Barnby
fc41b08940
Fix email credential checks
2024-01-25 17:59:26 +01:00
Jake Barnby
b3a4722758
Fix validators
2024-01-25 17:59:26 +01:00
Jake Barnby
7a5c226110
Fix tests
2024-01-25 17:59:26 +01:00
Jake Barnby
d405106aaa
Throw on enable if provider credentials are missing instead of ignoring
2024-01-25 17:59:26 +01:00
Jake Barnby
dc1dad9f5f
Merge pull request #7490 from appwrite/fix-target-deletes-not-triggered
...
Trigger deletes worker when target is deleted
2024-01-26 05:59:04 +13:00
fogelito
998c4d282d
Fix failing tests
2024-01-25 18:53:51 +02:00
fogelito
a782e20315
Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
...
Conflicts:
app/controllers/api/account.php
composer.json
composer.lock
src/Appwrite/Platform/Tasks/CalcTierStats.php
tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Bradley Schofield
c8d75fadf9
Merge branch '1.5.x' into 1.5.x-response-request-models
2024-01-25 12:27:00 +00:00
Jake Barnby
7106131545
Merge branch '1.5.x' into feat-maintenance-delete-expired-targets
2024-01-26 00:26:29 +13:00
Torsten Dittmann
a62b3f562e
sync: console
2024-01-25 10:57:58 +01:00
Jake Barnby
52a9b31521
Trigger deletes worker when target is deleted
2024-01-25 20:01:15 +13:00
Torsten Dittmann
eda568acff
chore: bump console
2024-01-24 18:54:03 +01:00
Torsten Dittmann
672b2d3cf7
chore: bump console version
2024-01-24 18:52:53 +01:00
Torsten Dittmann
b6d85b5a24
fix: email factor for otp
2024-01-24 17:50:16 +01:00