1
0
Fork 0
mirror of synced 2024-10-05 20:53:27 +13:00
Commit graph

4345 commits

Author SHA1 Message Date
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
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
5842f1950a chore: linter 2024-02-08 18:02:35 +00:00
Christy Jacob
ba4f708137
Apply suggestions from code review
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2024-02-08 23:26:43 +05:30
Bradley Schofield
5a1fef9ec6 Update V17.php 2024-02-08 11:52:51 +00: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
Bradley Schofield
d9faa7b9d3 Run Linter 2024-02-08 11:39:33 +00:00
Bradley Schofield
38c0f8ddab Add Query Converter 2024-02-08 11:39:01 +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
Jake Barnby
63e91cb3f3
Merge remote-tracking branch 'origin/1.5.x' into fix-password-version-enum-name
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2024-02-08 19:40:57 +13:00
Jake Barnby
9eaa0fff86
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-08 19:24:21 +13:00
Steven Nguyen
4ace8ed027
Replace catching \Exception with \Throwable
\Exception doesn't work as a catch-all because not everything extends
\Exception. For example, there was a problem where the messaging worker
didn't catch an exception here:

} catch (\Exception $e) {
    $deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
} finally {

As such, $deliveryErrors stayed as an empty array. In this case, the
$adapter->send() threw a TypeError which extends Error which implements
Throwable. Updating the catch to catch \Throwable ensures the error is
caught and $deliveryErrors gets updated.
2024-02-08 01:17:54 +00:00
Jake Barnby
df60ee9e72
Fix SHA function enum name 2024-02-08 00:17:38 +13:00
Jake Barnby
66a38898eb
Fix message status values and enums 2024-02-07 23:50:05 +13:00
Jake Barnby
4a45927af9
Fix email/sms template type enums getting the same values 2024-02-07 23:03:59 +13:00
shimon
93a99b561c remove debug lines 2024-02-07 11:54:18 +02:00
Jake Barnby
982310e7de
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks 2024-02-07 19:14:10 +13:00
Bradley Schofield
70ea6734e7 Add expire defaults 2024-02-06 19:22:54 +00:00
Christy Jacob
6a5defb91c
Merge pull request #7520 from appwrite/feat-sms-metric
Add count for messages(sms) metric
2024-02-06 22:44:06 +05:30
Bradley Schofield
559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
Christy Jacob
2f93dcc4df
Merge pull request #7547 from appwrite/feat-certificate-health-check
Add health certificate validity endpoint
2024-02-06 22:31:07 +05:30
Khushboo Verma
fb127270ce Add test for empty domain 2024-02-06 16:04:58 +05:30
Khushboo Verma
11ceeff5ca Add health certificate validity endpoint 2024-02-06 15:15:03 +05:30
Jake Barnby
f9e8216781
Fix FCM init 2024-02-06 04:13:56 +13:00
Jake Barnby
c32545fb49
Fix push message creation warnings 2024-02-06 04:13:35 +13:00
Jake Barnby
6e40973771
Fix response iteration 2024-02-06 04:11:40 +13:00
Jake Barnby
47dec4e187
Remove descriptions from response models 2024-02-06 02:35:15 +13:00
Jake Barnby
16e0f6d21f
Merge branch '1.5.x' into feat-rc-sdks 2024-02-06 02:25:09 +13:00
Jake Barnby
0a72b37b3e
Fix session response model 2024-02-06 02:17:04 +13:00
Jake Barnby
756359f326
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks 2024-02-06 02:01:46 +13:00
Jake Barnby
6c17a9ef95
Update generator and deploy RC SDKs 2024-02-06 01:40:51 +13:00
Christy Jacob
ad9cc748a5
Merge pull request #7471 from appwrite/fix-empty-user-updates
Fix: Empty values in PATCH of users
2024-02-05 15:54:40 +04:00
Jake Barnby
7ce01deec3
Fix console enum specs 2024-02-06 00:39:52 +13:00
Matej Bačo
7beb9080fa Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates 2024-02-05 10:38:48 +00:00
Khushboo Verma
1fefb7e133 Add a 20 second delay to maintenance worker 2024-02-05 15:01:23 +05:30
Khushboo Verma
8440aad375 Merge branch '1.5.x' into feat-block-countries 2024-02-05 13:44:51 +05:30
Jake Barnby
7322d7f83a
Fix lint 2024-02-05 21:12:57 +13:00
Khushboo Verma
e8523e38f7 Merge branch '1.5.x' into feat-block-countries 2024-02-05 13:26:52 +05:30
Jake Barnby
15f433794f
Add missing enum cases 2024-02-05 20:25:34 +13:00
Jake Barnby
c193260335
Fix usage enums 2024-02-05 19:32:05 +13:00
shimon
6a6c3445fa updates 2024-02-04 20:02:01 +02:00
shimon
af2b640948 updates 2024-02-04 10:33:04 +02:00
shimon
036fa93295 updates 2024-02-04 09:34:42 +02:00
shimon
a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby
68931c8672
Merge pull request #7538 from appwrite/fix-spec-generation
Fix spec generation
2024-02-03 04:04:00 +13:00
Jake Barnby
f14c0cc0aa
Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation
# 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-03 03:35:14 +13:00
Jake Barnby
465bc81071
Add deletes job to delete targets tied to a particular session 2024-02-03 03:06:31 +13:00
Khushboo Verma
7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
Torsten Dittmann
db321db0fb fix: code review 2024-02-02 13:42:15 +01:00
Torsten Dittmann
75fc59931a Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-02 13:30:11 +01:00
Jake Barnby
d0cccf72ea
Add spec generation changes for OpenAPI as well 2024-02-03 00:33:48 +13:00
Jake Barnby
0e8e455903
Fix spec generation 2024-02-02 23:54:34 +13:00
Khushboo Verma
0ea7b28a6b Resolve merge conflicts 2024-02-02 12:53:25 +05:30
Jake Barnby
499f0a53ea
Update to standard namespacing for enums 2024-02-02 17:53:19 +13:00
shimon
883cfedc46 updates 2024-02-01 22:14:09 +02:00
shimon
a254bb7edb Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 2024-02-01 17:13:38 +02:00
shimon
030cdf3cc8 updates 2024-02-01 17:12:27 +02:00
Eldad A. Fux
321a998947
Merge pull request #7533 from appwrite/feat-rename-security-phrases
Feat: Rename security phrases
2024-02-01 15:45:15 +01:00
Matej Bačo
ef3f7878dc PR review changes 2024-02-01 14:13:30 +00:00
Torsten Dittmann
9c0bd9fc6e
Merge pull request #7489 from appwrite/update-webhook-abuse-limit
Add webhook max failed attempts as env variable
2024-02-01 13:34:57 +01:00
Khushboo Verma
d3b002a48e Merge branch '1.5.x' into feat-block-countries 2024-02-01 17:49:14 +05:30
Torsten Dittmann
ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00