Commit graph

4410 commits

Author SHA1 Message Date
shimon
84f47dc1d2 adding limit to queue retry 2024-02-28 20:21:35 +02:00
Bradley Schofield
8fd610fdf6 Merge branch '1.5.x' into feat-fix-1.5.x-migrations 2024-02-27 13:19:41 +00:00
Bradley Schofield
4050e93b1d Run Linter 2024-02-27 13:19:35 +00:00
Jake Barnby
f3fa172482
Use a set to avoid message duplication 2024-02-28 01:01:39 +13:00
Jake Barnby
7a8ea7278e
Fix exceptions 2024-02-28 01:00:36 +13:00
Jake Barnby
12e8cc450f
Fix redundant batching 2024-02-28 00:59:40 +13:00
Jake Barnby
e1e9fc6589
Remove redundant checks 2024-02-28 00:56:52 +13:00
Jake Barnby
b862c8ee1e
Query provider type directly for targets 2024-02-28 00:56:23 +13:00
Jake Barnby
4a71e6ef4f
Use array_push instead of array_merge in loops 2024-02-28 00:55:11 +13:00
Jake Barnby
16071d9056
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# 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-27 18:19:02 +13:00
Bradley Schofield
f4b8ae8b88 Change factors code and update Response model tests 2024-02-26 11:50:25 +00:00
Jake Barnby
33c5293811
Merge remote-tracking branch 'origin/1.5.x' into fix-rescheduling 2024-02-27 00:09:52 +13:00
Jake Barnby
564c1df701
Fix rescheduling with existing schedule 2024-02-26 23:37:12 +13:00
Jake Barnby
cd554aa17f
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	app/config/specs/open-api3-1.5.x-client.json
#	app/config/specs/open-api3-1.5.x-console.json
#	app/config/specs/open-api3-1.5.x-server.json
#	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-1.5.x-client.json
#	app/config/specs/swagger2-1.5.x-console.json
#	app/config/specs/swagger2-1.5.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.lock
2024-02-26 18:43:52 +13:00
Jake Barnby
d7a16ae7b0
Merge branch '1.5.x' into fix-password-validation 2024-02-26 17:52:41 +13:00
Bradley Schofield
7ad4af8d91 Fix misssed items in Migrations and Response filters 2024-02-25 17:30:26 +00:00
Bradley Schofield
e37caeafae Merge branch '1.5.x' into feat-migrations-service-fixes 2024-02-25 14:11:48 +00:00
Bradley Schofield
450de95c57 Update migration lib and fix typo 2024-02-25 14:09:22 +00:00
loks0n
70624a6454 chore: $method 2024-02-25 10:17:37 +00:00
loks0n
7aa4eb3db6 chore: revert $method changes 2024-02-25 10:13:28 +00:00
Matej Bačo
cb7da26d53 Fix empty pass with personal data check 2024-02-25 09:19:30 +00:00
Christy Jacob
7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
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
Damodar Lohani
9fe0a5a31b
Update Mail.php 2024-02-24 21:03:18 +05:45
loks0n
3a7236c66d fix: specs 2024-02-24 15:01:13 +00:00
Damodar Lohani
d91a0e3048 reset variables 2024-02-24 14:56:53 +00:00
Damodar Lohani
ea484e593b format 2024-02-24 14:49:17 +00:00
Bradley Schofield
3f603995f5 Make sure we're revoking API keys before throwing an exception 2024-02-24 14:43:33 +00:00
loks0n
b650884351 chore: fix hide in specs 2024-02-24 14:38:09 +00:00
Damodar Lohani
ca1c83c2cf method to reset attachment 2024-02-24 14:33:38 +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
loks0n
42e9865dff fix: hideServer & hideClient 2024-02-24 13:42:33 +00:00
loks0n
6cc1235e86 chore: fmt 2024-02-24 13:23:16 +00:00
loks0n
5ff2121ef7 fix: sdk.hideServer & sdk.hideClient 2024-02-24 13:17:58 +00:00
loks0n
5ba50c842b chore: remove array sdk method 2024-02-24 12:53:47 +00:00
Jake Barnby
46575b6df7
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	app/controllers/api/account.php
#	composer.lock
2024-02-25 00:16:40 +13:00
Jake Barnby
bae1ba714c
Enum format fixes 2024-02-24 14:16:05 +13: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
ce0afb61dc
Merge pull request #7621 from appwrite/feat-fix-1.5.x-migrations
Fix 1.5.x Migrations
2024-02-24 01:08:11 +13:00
Jake Barnby
82efd57146
Fix hidden files not copied when generating SDKs 2024-02-23 18:32:15 +13:00
Jake Barnby
7c42a59c85
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# 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
#	composer.lock
2024-02-23 18:01:59 +13:00
Luke B. Silver
f285173f4e
Merge branch '1.5.x' into feat-ssr-dx 2024-02-22 13:22:41 +00:00
Bradley Schofield
cb110c1481 Merge branch '1.5.x' into feat-fix-1.5.x-migrations 2024-02-22 10:28:06 +00:00
Bradley Schofield
bdf044ed8c Update 'email' to 'password' in factors 2024-02-22 10:21:25 +00:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
Torsten Dittmann
e7259f0a3d
Merge branch '1.5.x' into feat-rc-sdks 2024-02-21 18:22:17 +01:00
Torsten Dittmann
e7f94d7095 fix: update mfa sdk method name 2024-02-21 18:08:22 +01:00
loks0n
b2e1c162d2 chore: fmt 2024-02-21 16:27:37 +00:00
loks0n
e3c261b9e4 fix: msg91 2024-02-21 16:24:55 +00:00
Jake Barnby
623c82c727
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/specs/open-api3-1.4.x-client.json
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-1.4.x-server.json
#	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-1.4.x-client.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-1.4.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.json
#	composer.lock
#	src/Appwrite/Auth/Validator/Phone.php
2024-02-22 01:32:26 +13: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
loks0n
a3b88f2015 chore: remove x-forwarded-for 2024-02-21 12:18:50 +00:00
Bradley Schofield
d020730a74 Address Shimon's comments 2024-02-21 10:20:55 +00:00
Bradley Schofield
a2b9dbc208 Update V20.php 2024-02-21 09:42:04 +00:00
Bradley Schofield
370e814b8c Update Factors Session Migration 2024-02-21 09:31:52 +00:00
Jake Barnby
7e7a0cfabe
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks 2024-02-21 22:07:19 +13:00
Jake Barnby
9498d680fb
Add doc refs 2024-02-21 22:04:27 +13:00
Jake Barnby
e91565ecc9
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# 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
#	composer.lock
2024-02-21 19:17:50 +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
Bradley Schofield
a5d6af9ded Add 'factors' migration 2024-02-20 15:47:55 +00:00
Bradley Schofield
bfe861f846 Run Linter 2024-02-20 15:05:42 +00: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
35441dc542
Merge remote-tracking branch 'origin/1.5.x' into feat-email-attachments 2024-02-21 02:33:35 +13:00
Jake Barnby
b9b54b808c
Merge pull request #7618 from appwrite/feat-remove-callback-resources
Remove callback resources from workers
2024-02-21 02:30:32 +13:00
Bradley Schofield
441875e498 Merge branch '1.5.x' into feat-fix-1.5.x-migrations 2024-02-20 13:27:13 +00:00
Jake Barnby
b265106af2
Fix tests 2024-02-21 02:20:09 +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
loks0n
1fa0f18e44 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr-dx 2024-02-20 12:43:50 +00:00
Jake Barnby
bbce53cda5
Auto trigger messaging events 2024-02-21 01:06:35 +13:00
loks0n
fa28496b32 feat: ssr dx changes 2024-02-20 11:45:11 +00:00
Jake Barnby
2f711c84ed
Remove callback resources from workers 2024-02-21 00:40:55 +13:00
Jake Barnby
5747b33e38
Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00
Shimon Newman
3f7d35065e
Merge pull request #7614 from appwrite/chore-usage-queue-health
usage/usage-dump queue health endpoints
2024-02-20 09:59:52 +02:00
Jake Barnby
d61f4e4d2d
Add compound UID to spec generator 2024-02-20 20:15:08 +13:00
Jake Barnby
4bc6c202d9
Use compound ID for push notification image 2024-02-20 18:25:57 +13:00
Jake Barnby
42e1b0dfe3
Merge remote-tracking branch 'origin/feat-email-attachments' into feat-push-images 2024-02-20 18:06:29 +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
d3913c422b
Add compound UID valdiator 2024-02-19 23:57:54 +13:00
Jake Barnby
1bb75fdd63
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images
# Conflicts:
#	src/Appwrite/Extend/Exception.php
2024-02-19 20:44:11 +13:00
Jake Barnby
e20f46ba1b
Bump response format to fix filters being used 2024-02-19 16:54:53 +13:00
Jake Barnby
98f4178c39
Fix enums for API changes 2024-02-19 16:53:43 +13:00
Eldad A. Fux
44a9aed48e
Merge pull request #7165 from appwrite/feat-more-phone-validation
Feat more phone validation
2024-02-18 22:39:45 +01:00
Bradley Schofield
461795b6ff Update V17.php 2024-02-18 08:35:26 +00:00
Torsten Dittmann
ce4f92a6c8 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-rc-sdks 2024-02-17 13:25:56 +00:00
Bradley Schofield
aa05901f2f Merge branch '1.5.x' into feat-fix-1.5.x-migrations 2024-02-17 11:30:19 +00:00
Bradley Schofield
f6f8816e2b Migration Fixes 2024-02-17 11:29:49 +00:00
Torsten Dittmann
de0e83f703 fix: move user and project logic from general to api hook 2024-02-16 17:58:51 +00: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
Jake Barnby
4d7becc459
Apply suggestions from code review 2024-02-16 20:23:31 +13:00
Jake Barnby
c192f14d01
Merge remote-tracking branch 'origin/1.5.x' into feat-topic-totals-per-type 2024-02-16 14:08:04 +13:00
shimon
2a5f21e982 Addressed comments 2024-02-15 17:12:37 +02:00
Christy Jacob
7dbb1c6399
Merge branch 'main' into refactor-cache-poc 2024-02-15 20:33:57 +05:30
Torsten Dittmann
e35a9efb12 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-rc-sdks 2024-02-15 11:32:15 +00:00
Torsten Dittmann
14ecbd6658 fix: 2fa endpoint params 2024-02-15 11:26:34 +00:00
Jake Barnby
d38197380e
Support adding image to push notification via storage file 2024-02-15 22:36:34 +13:00
Jake Barnby
d82c7c24c4
Fix allowed query attributes 2024-02-15 19:35:47 +13:00
Jake Barnby
afba7f75f0
Update appropriate total count when mutating topic 2024-02-15 17:23:30 +13:00
Jake Barnby
e462e916f0
Add email, sms and push totals to topic 2024-02-15 17:22:43 +13:00
Jake Barnby
ae7a5c6c9c
Merge pull request #7580 from appwrite/feat-subscribe-permission
Feat subscribe permission
2024-02-15 16:47:44 +13:00
shimon
dae01f7077 usage logs updates 2024-02-14 23:07:25 +02:00
shimon
26af9b7463 usage logs updates 2024-02-14 23:05:01 +02: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
Bradley Schofield
e2c6a2067a Address comments 2024-02-13 09:39:09 +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
b2f119868d
Add test 2024-02-13 17:41:07 +13: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
3a77ec1920
Merge remote-tracking branch 'origin/1.5.x-response-request-models' into cache-attr-migrations 2024-02-13 15:07: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
8f525f5304
Merge pull request #7551 from appwrite/fix-template-enum-seperation
Fix email/sms template type enums getting the same values
2024-02-13 12:39:07 +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
Jake Barnby
0bd3fe6473
Merge pull request #7571 from appwrite/fix-updating-message-status
Fix updating message status
2024-02-13 12:38:39 +13:00
Christy Jacob
c076dfe6f1
Merge pull request #7576 from appwrite/refactor-usage-sn
Refactor usage sn
2024-02-12 23:05:56 +05:30
shimon
8256c8b294 cache collection attr migration 2024-02-12 17:22:33 +02:00
Jake Barnby
dd7ac27f11
Merge pull request #7570 from appwrite/feat-support-label-queries
Feat support label queries
2024-02-12 22:46:38 +13:00
shimon
e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
Jake Barnby
862f20479d
Merge pull request #7568 from appwrite/chore-merge-main
Merge main
2024-02-12 22:08:13 +13: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
f237e863de
Throw on updating sent, processing, failed message 2024-02-12 16:55:00 +13:00
Jake Barnby
dd8fd2e394
Allow querying on labels attribute 2024-02-12 16:10:28 +13:00
Jake Barnby
05884e154e
Update telesign credentials 2024-02-12 15:10:18 +13:00
Jake Barnby
f2efe9ca72
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-12 15:03:51 +13:00
Damodar Lohani
869d3c9809 fix url 2024-02-12 01:27:20 +00:00
Damodar Lohani
545a5ee126 set default endpoint and host name for specs. 2024-02-12 01:21:28 +00:00
Jake Barnby
18f7168160
Merge main 2024-02-12 14:18:19 +13:00
Eldad A. Fux
eb75b527ad
Merge pull request #7560 from appwrite/update-x-example-format
Update place holders from [PARAM_NAME] to <PARAM_NAME>
2024-02-11 23:04:42 +01:00
Damodar Lohani
e462d73f65 prevent user with active team, from deletion 2024-02-11 09:31:09 +00:00
Christy Jacob
e2baefe8c6
Merge pull request #7500 from appwrite/fix-account-delete
PEA-233-prevent console user deletion before deleting their team
2024-02-11 14:52:24 +05:30
Damodar Lohani
4ffde8e827
fix indentation 2024-02-11 14:55:14 +05:45
Damodar Lohani
57a695367b
fix typo 2024-02-11 14:54:32 +05:45
Damodar Lohani
681688e252
fix rename 2024-02-11 14:52:54 +05:45
shimon
b09386727b Usage logs text update 2024-02-10 10:34:44 +02:00
shimon
179a045399 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
 Conflicts:
	composer.lock
2024-02-09 16:29:26 +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
Vincent (Wen Yu) Ge
f785ffbd71 Update place holders from [PARAM_NAME] to <PARAM_NAME> 2024-02-09 03:06:38 +00:00