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
|
ca65f4ab2f
|
sync against main
|
2024-01-31 20:22:49 +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 |
|
Bradley Schofield
|
17602d513e
|
Merge Stats and 1.5.x migrations
|
2024-01-25 14:22:21 +00:00 |
|
|
Bradley Schofield
|
ad1d514fb2
|
Create V21.php
|
2024-01-25 13:05:43 +00:00 |
|
|
Bradley Schofield
|
c8d75fadf9
|
Merge branch '1.5.x' into 1.5.x-response-request-models
|
2024-01-25 12:27:00 +00:00 |
|
|
Bradley Schofield
|
3226182ec8
|
Create the targets in the target collection instead of on the user
|
2024-01-24 18:13:36 +00:00 |
|
Torsten Dittmann
|
da638a10f7
|
Merge pull request #7486 from appwrite/sync-main-with-1.5.x
sync: 1.5.x with main
|
2024-01-24 16:23:30 +01:00 |
|
|
Torsten Dittmann
|
80193175f1
|
test: fix database validator descriptions
|
2024-01-24 15:56:43 +01:00 |
|
|
Torsten Dittmann
|
50510d9f87
|
revert: phpunit stop on failure
|
2024-01-24 15:33:18 +01: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
|
e148617d3e
|
fix: builds worker
|
2024-01-24 12:20:13 +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
|
d13023f23c
|
fix: deletes worker
|
2024-01-24 11:42:04 +01: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 |
|
|
Torsten Dittmann
|
47ea083ea4
|
Merge pull request #7005 from appwrite/refactor-usage-sn
Refactor usage
|
2024-01-24 10:00:07 +01:00 |
|
|
Bradley Schofield
|
4ce5256c1e
|
Merge branch '1.5.x' into 1.5.x-response-request-models
|
2024-01-23 16:17:56 +00:00 |
|
Matej Bačo
|
52786b8273
|
PR review changes
|
2024-01-23 10:35:47 +00:00 |
|
|
Bradley Schofield
|
5d49ac80b4
|
Add create targets migrations
|
2024-01-23 10:21:55 +00:00 |
|
|
Christy Jacob
|
9bac4f6728
|
Merge pull request #7307 from appwrite/feat-smtp-test
Feat smtp test endpoint
|
2024-01-23 13:56:46 +04:00 |
|
|
Matej Bačo
|
89f778014a
|
Fix invalid specs
|
2024-01-23 09:27:25 +00:00 |
|
|
Matej Bačo
|
db732e4498
|
Revert console version
|
2024-01-23 09:13:37 +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 |
|
|
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 |
|
Matej Bačo
|
f7e9d8fc19
|
Update app/config/locale/translations/en.json
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
|
2024-01-22 15:57:06 +01:00 |
|
|
Matej Bačo
|
1ac7fae9f8
|
Fix more tests
|
2024-01-22 14:46:53 +00:00 |
|
|
Matej Bačo
|
d637efb27c
|
Fix failing tests
|
2024-01-22 14:41:23 +00:00 |
|
|
Matej Bačo
|
cba974805d
|
PR review changes
|
2024-01-22 14:30:11 +00:00 |
|
|
Christy Jacob
|
3656be3da5
|
Merge pull request #7452 from appwrite/feat-session-renewal
Feat: session renewal
|
2024-01-22 18:28:55 +04:00 |
|
|
Matej Bačo
|
3bf89a931d
|
PR review changes
|
2024-01-22 13:20:48 +00:00 |
|
|
Matej Bačo
|
33e1d61bd9
|
Fix missing languages
|
2024-01-22 13:18:19 +00:00 |
|
|
shimon
|
d220c2bdd7
|
Added marked_for_deletion and billing_plan_downgrade
to hamster export
|
2024-01-22 14:48:25 +02:00 |
|
|
Bradley Schofield
|
9edf73fa3c
|
Merge branch '1.5.x' into 1.5.x-response-request-models
|
2024-01-22 11:23:39 +00:00 |
|
|
Bradley Schofield
|
b88ff90c22
|
Update V17Test.php
|
2024-01-22 11:23:23 +00:00 |
|
|
Bradley Schofield
|
a63246c2cf
|
Update V20.php
|
2024-01-22 11:21:25 +00:00 |
|
|
Matej Bačo
|
9ad5aa79d0
|
Fix failing tests
|
2024-01-22 11:20:33 +00:00 |
|
|
Bradley Schofield
|
5faf7899f8
|
Add Webhooks and schedules DB migrations
|
2024-01-22 11:18:43 +00:00 |
|
|
Matej Bačo
|
554103687e
|
linter fix
|
2024-01-22 11:15:55 +00:00 |
|
|
Matej Bačo
|
58fa2efad2
|
Translate new keys
|
2024-01-22 11:15:24 +00:00 |
|