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
|
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
|
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 |
|
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 |
|
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 |
|
Jake Barnby
|
52a9b31521
|
Trigger deletes worker when target is deleted
|
2024-01-25 20:01:15 +13:00 |
|
Torsten Dittmann
|
88cf7ea9e8
|
fix: race condition with creating a user with targets
|
2024-01-24 15:31:58 +01:00 |
|
Torsten Dittmann
|
62e459c581
|
fix: workers
|
2024-01-24 12:29:36 +01:00 |
|
Torsten Dittmann
|
d087a76329
|
Merge branch '1.5.x' into sync-main-with-1.5.x
|
2024-01-24 12:06:22 +01:00 |
|
Christy Jacob
|
6f52b5f7a1
|
Merge pull request #7475 from appwrite/fix-certificate-mail-branding
Fix: Certificate email style
|
2024-01-24 14:47:21 +04:00 |
|
Torsten Dittmann
|
9f5a0312cf
|
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
|
2024-01-24 11:24:59 +01:00 |
|
fogelito
|
55c72521e9
|
Upgrade base:0.7.2
|
2024-01-24 10:37:28 +02:00 |
|
Bradley Schofield
|
4ce5256c1e
|
Merge branch '1.5.x' into 1.5.x-response-request-models
|
2024-01-23 16:17:56 +00:00 |
|
fogelito
|
8dd387cfbe
|
Parsing and Throw Error
|
2024-01-23 17:14:14 +02:00 |
|
Matej Bačo
|
52786b8273
|
PR review changes
|
2024-01-23 10:35:47 +00:00 |
|
Matej Bačo
|
89f778014a
|
Fix invalid specs
|
2024-01-23 09:27:25 +00:00 |
|
Matej Bačo
|
187165f397
|
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test
|
2024-01-23 09:12:22 +00:00 |
|
Matej Bačo
|
84a0b30b99
|
Revert console changes
|
2024-01-23 09:09:22 +00:00 |
|
Matej Bačo
|
8a05b634fe
|
Merge remote-tracking branch 'origin/1.5.x' into fix-certificate-mail-branding
|
2024-01-23 09:04:20 +00:00 |
|
Matej Bačo
|
e26a9d17cb
|
PR review changes
|
2024-01-23 09:03:18 +00:00 |
|
Christy Jacob
|
3c3c34add9
|
Merge pull request #7474 from appwrite/fix-email-image-endpoint
Fix: Email image endpoints
|
2024-01-23 00:05:01 +04:00 |
|
Torsten Dittmann
|
a9f1e4d78d
|
feat: delete account (#7392)
* feat: delete account
* fix: new endpoint only for console sdk
* fix: hide endpoint from public sdks
* fix: account delete scope
|
2024-01-22 18:29:10 +01:00 |
|
fogelito
|
37bdb17cc6
|
Deprecated changes
|
2024-01-22 19:24:12 +02:00 |
|
Matej Bačo
|
0c7a69e665
|
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test
|
2024-01-22 16:05:38 +00:00 |
|
Matej Bačo
|
871c29d1a5
|
PR review changes
|
2024-01-22 15:53:11 +00:00 |
|
Christy Jacob
|
cfc25288b5
|
Merge pull request #7422 from appwrite/feat-email-otp
Feat: Email OTP
|
2024-01-22 19:18:39 +04:00 |
|
Matej Bačo
|
05a83d6d1b
|
Merge branch 'feat-email-otp' of https://github.com/appwrite/appwrite into feat-email-otp
|
2024-01-22 15:02:51 +00:00 |
|
Matej Bačo
|
fc3fa8f1d7
|
PR review changes
|
2024-01-22 15:02:33 +00:00 |
|