Jake Barnby
9bb9f1eee7
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets
...
# Conflicts:
# tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-05-23 15:37:13 +12:00
Christy Jacob
aa76862692
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x
2024-05-22 19:43:31 +00:00
shimon
074eab3d63
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
...
Conflicts:
composer.json
composer.lock
2024-05-22 15:51:24 +03:00
loks0n
e1e4cb44f3
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-improve-header-demo-values
2024-05-22 10:52:06 +01:00
Jake Barnby
c7106b9147
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets
2024-05-22 12:50:58 +12:00
Binyamin Yawitz
ab0d6f7c19
refactor(messaging worker): Refactoring local device to worker only
2024-05-21 15:48:53 -04:00
Matej Bačo
a115f878b3
Merge remote-tracking branch 'origin/1.6.x' into feat-function-tokens
2024-05-21 10:28:21 +00:00
Steven Nguyen
1269294ff5
Bump appwrite version to 1.5.6
2024-05-20 15:27:52 -07:00
Steven Nguyen
722f3291fa
Merge branch 'main' into chore-sync-with-main
2024-05-20 18:33:52 +00:00
Christy Jacob
d258240f08
Merge pull request #8152 from appwrite/fix-improve-cold-start-error
...
fix: improve cold start error
2024-05-20 17:26:58 +01:00
Christy Jacob
984da4f4ac
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main
2024-05-20 11:05:24 +00:00
loks0n
863a2ce0a9
chore: matej review
2024-05-20 11:44:08 +01:00
loks0n
b3080f0c0a
Merge branch 'fix-improve-cold-start-error' of https://github.com/appwrite/appwrite into fix-improve-cold-start-error
2024-05-20 11:07:28 +01:00
loks0n
4d572d4a05
chore: errors.php
2024-05-20 11:05:53 +01:00
Luke B. Silver
ae321268b5
Merge branch 'main' into fix-improve-cold-start-error
2024-05-18 13:53:02 +01:00
Luke B. Silver
237bec49b2
Merge branch 'main' into chore-remove-compose-version
2024-05-18 13:52:48 +01:00
loks0n
2c19bb0a1d
chore: more deletions
2024-05-17 20:46:14 +01:00
Luke B. Silver
0d5d5336ed
Merge branch '1.5.x' into feat-improve-header-demo-values
2024-05-17 18:20:18 +01:00
loks0n
3d119ad1a6
fix: improve cold start error
2024-05-17 18:16:10 +01:00
Matej Bačo
d57c459e6f
Merge branch '1.6.x' into feat-function-tokens
2024-05-17 18:16:43 +02:00
Jake Barnby
d3dc21a048
Merge pull request #8142 from appwrite/fix-shared-project-delete
...
Fix shared project delete
2024-05-17 17:55:22 +12:00
Jake Barnby
6a9e983651
Catch DB errors on delete
2024-05-17 16:38:40 +12:00
Jake Barnby
d03fb1458c
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-shared-project-delete
2024-05-17 14:55:01 +12:00
Jake Barnby
60179b1790
Fix not account for abuse/audit on project delete
2024-05-17 14:54:40 +12:00
Matej Bačo
2e1f67245d
Fix bugs, add old api key test
2024-05-16 08:39:15 +00:00
Christy Jacob
10722aa736
chore: cleanup obsolete tasks and workers
2024-05-16 07:11:00 +00:00
Christy Jacob
a63667f5a3
chore: cleanup obsolete tasks
2024-05-16 07:04:40 +00:00
Steven Nguyen
d54986dc75
fix(messaging): fix TextMagic class name
...
The class name in utopia-php/mssaging is TextMagic so use the same here
to prevent an error like:
> Class "Utopia\Messaging\Adapter\SMS\Textmagic" not found ...
2024-05-16 05:39:46 +00:00
Steven Nguyen
03fd62cc04
Merge branch 'main' into 1.5.x
2024-05-15 11:36:15 -07:00
Luke B. Silver
44ef0c365a
Merge branch '1.5.x' into feat-improve-header-demo-values
2024-05-15 17:30:21 +01:00
Matej Bačo
37176e7865
Backwards compatible approach
2024-05-14 12:33:49 +00:00
Matej Bačo
9846b573bd
Merge remote-tracking branch 'origin/main' into feat-function-tokens
2024-05-14 11:59:43 +00:00
Matej Bačo
54c953d559
Add prefix of api key types
2024-05-14 11:58:31 +00:00
shimon
510f864b06
adding null safety
2024-05-12 19:51:16 +03:00
shimon
15b8aa5b16
composer format
2024-05-12 18:12:40 +03:00
shimon
989b0d9f10
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
2024-05-12 15:29:00 +03:00
Eldad A. Fux
53cd729412
Merge pull request #8078 from appwrite/fix-python-build-logs
...
Fix: Python failing builds
2024-05-10 19:48:27 +01:00
Matej Bačo
8cc2530210
PR review changes
2024-05-09 13:40:31 +00:00
Matej Bačo
5002b0f3fa
PR review changes
2024-05-09 11:50:45 +00:00
Damodar Lohani
1d9f5fa29d
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-upgrade-platform-with-module
2024-05-09 07:50:17 +00:00
Jake Barnby
1ee1284577
Merge pull request #8107 from appwrite/fix-project-deletes
...
Fix project deletes for shared tables
2024-05-09 17:51:38 +12:00
Jake Barnby
207c725d4d
Merge pull request #8076 from appwrite/fix-tests-for-cl-1
...
Fix tests for CL
2024-05-09 17:36:10 +12:00
Jake Barnby
d0e258854c
Fix project deletes for shared tables
2024-05-09 16:52:53 +12:00
Steven Nguyen
c52bf2a0a1
fix(auth): Don't use email in place for name for Apple OAuth2
...
Apple OAuth2 does not return the user's name in the claims and so we
used email instead, but this can look broken to users and developers to
see an email where the name should be.
2024-05-08 16:35:17 -07:00
xue
1043e2f810
Merge branch 'main' into cicd-fix-float-to-int-conversion-warning-at-appwrite-doctor
2024-05-09 01:10:52 +03:00
bhc
b04b7c5f45
chore: Improve sleep duration in Doctor.php
2024-05-09 00:56:56 +03:00
Eldad Fux
c53de9fb6b
Merge branch 'main' of github.com:appwrite/appwrite into feat-eldad4-coroutines
2024-05-08 18:21:55 +01:00
shimon
88e67c8d58
getCountryCode
2024-05-08 14:23:11 +03:00
shimon
17b9f136f1
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
...
Conflicts:
composer.json
composer.lock
src/Appwrite/Platform/Workers/Messaging.php
2024-05-08 14:05:14 +03:00
Jake Barnby
360abf4b69
Return from create attribute job is unable to find it in the attributes table
2024-05-08 21:16:27 +12:00