Commit graph

343 commits

Author SHA1 Message Date
Bradley Schofield
450de95c57 Update migration lib and fix typo 2024-02-25 14:09:22 +00:00
Bradley Schofield
bd59a3c82e Merge branch 'feat-migrations-service-fixes' of https://github.com/appwrite/appwrite into feat-migrations-service-fixes 2024-02-24 15:22:30 +00:00
Bradley Schofield
725dd479d2 Fix Typos 2024-02-24 15:21:21 +00:00
Bradley Schofield
eaee61db2a
Update src/Appwrite/Platform/Workers/Migrations.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2024-02-24 15:19:50 +00:00
Bradley Schofield
3f603995f5 Make sure we're revoking API keys before throwing an exception 2024-02-24 14:43:33 +00:00
Bradley Schofield
d13cb6f949 Merge branch '1.5.x' into feat-migrations-service-fixes 2024-02-24 14:20:31 +00:00
Bradley Schofield
37707007a1 Use new migration error handling 2024-02-24 14:18:55 +00:00
Jake Barnby
11e9f43982
Allow setting APNS to sandbox mode 2024-02-24 13:34:08 +13:00
Torsten Dittmann
f5cdd5e4cc fix: comma in email templates 2024-02-23 14:59:12 +01:00
Torsten Dittmann
9ae2948d0e fix: mfa email template 2024-02-23 14:59:12 +01:00
Jake Barnby
942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/collections.php
#	app/config/errors.php
#	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/teams.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/worker.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Certificates.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Messaging.php
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Jake Barnby
41be4da5c9
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 13:01:53 +13:00
Jake Barnby
a9d1aa5bca
Merge pull request #7620 from appwrite/refactor-remove-resource-collection
Refactor remove resource collection
2024-02-21 13:00:48 +13:00
Jake Barnby
ad8450af32
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 03:29:00 +13:00
Jake Barnby
400b28de8a
Replace resourceCollection with switch 2024-02-21 03:25:01 +13:00
Jake Barnby
379c79dae9
Consistent naming for device resources 2024-02-21 03:10:51 +13:00
Jake Barnby
2667d1fb07
Inject always local file device 2024-02-21 02:50:44 +13:00
Jake Barnby
439e7b1ccf
Merge remote-tracking branch 'origin/feat-remove-callback-resources' into feat-email-attachments
# Conflicts:
#	app/worker.php
#	src/Appwrite/Platform/Workers/Messaging.php
2024-02-21 02:00:46 +13:00
Jake Barnby
bbce53cda5
Auto trigger messaging events 2024-02-21 01:06:35 +13:00
Jake Barnby
2f711c84ed
Remove callback resources from workers 2024-02-21 00:40:55 +13:00
Jake Barnby
4bc6c202d9
Use compound ID for push notification image 2024-02-20 18:25:57 +13:00
Jake Barnby
d15e85d1f6
Fix injecting invalid resource 2024-02-20 17:27:35 +13:00
Jake Barnby
710e08c109
Make sure to clear cache if file was downloaded from remote source 2024-02-20 00:11:10 +13:00
Jake Barnby
022c4678ec
Allow attaching files from storage to emails 2024-02-20 00:08:57 +13:00
Jake Barnby
14a243cc37
Merge pull request #7457 from appwrite/1.5.x-response-request-models
Update Response and Request filters aswell as Migrations for 1.5.x
2024-02-16 20:58:08 +13:00
Christy Jacob
7dbb1c6399
Merge branch 'main' into refactor-cache-poc 2024-02-15 20:33:57 +05:30
Jake Barnby
afba7f75f0
Update appropriate total count when mutating topic 2024-02-15 17:23:30 +13:00
shimon
459db9b43e usage updates 2024-02-14 07:34:12 +02:00
Jake Barnby
cbf1085850
Merge pull request #7135 from appwrite/remove-deletes-db-leftovers
Remove database methods from deletes worker
2024-02-13 23:13:24 +13:00
Bradley Schofield
b60c591f8f Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-13 09:45:59 +00:00
shimon
dac0e2a543 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 10:48:47 +02:00
Jake Barnby
2ce85ce6ef
Add unknown error is delivered total is 0 but there were no delivery errors 2024-02-13 17:08:45 +13:00
Jake Barnby
66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 15:07:16 +13:00
Jake Barnby
37522ea66f
Merge branch '1.5.x' into fix-catch-exception 2024-02-13 12:47:36 +13:00
Jake Barnby
ff1f7e4819
Merge pull request #7569 from appwrite/fix-telesign-params
Fix telesign params
2024-02-13 12:38:49 +13:00
shimon
e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
shimon
6b6f04d2d3 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Jake Barnby
05884e154e
Update telesign credentials 2024-02-12 15:10:18 +13:00
Jake Barnby
18f7168160
Merge main 2024-02-12 14:18:19 +13:00
shimon
b09386727b Usage logs text update 2024-02-10 10:34:44 +02:00
Bradley Schofield
0f3a1c3762 Merge branch 'main' into 1.5.x-response-request-models 2024-02-09 12:36:02 +00:00
shimon
d0985db27d interval update 2024-02-09 13:22:48 +02:00
shimon
3788d5bceb interval update 2024-02-09 12:56:37 +02:00
shimon
c1fb4ecf39 interval update 2024-02-08 21:41:23 +02:00
shimon
a1539395c6 interval update 2024-02-08 21:08:29 +02:00
shimon
72ee7d7f34 interval update 2024-02-08 20:51:54 +02:00
Christy Jacob
2fdd0656d0 Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn 2024-02-08 11:48:53 +00:00
shimon
790cdc297b composer update 2024-02-08 10:26:45 +02:00
shimon
632f78140f Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
 Conflicts:
	composer.json
	composer.lock
2024-02-08 09:29:12 +02:00
Christy Jacob
243ddd4b33
Merge pull request #7519 from appwrite/update-param-name
Update param name
2024-02-08 12:55:19 +05:30