CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-05 06:31:08 +12:00
Code Issues Projects Releases Wiki Activity
19556 commits 205 branches 384 tags 334 MiB
Commit graph

4555 commits

Author SHA1 Message Date
Khushboo Verma 6d8443d5cd Addressed PR comments 2024-01-05 15:13:54 +05:30
Steven Nguyen 7e9525f0f9
Update validation of topics, users, and targets 
They should be an array of UID and not just array of Text.
 2024-01-05 00:10:57 +00:00
Matej Bačo ba32170f72 Improve password validator hook 2024-01-04 16:26:15 +01:00
Khushboo Verma fb9e393c97 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-04 16:42:47 +05:30
Damodar Lohani 640ab7bf87 Merge branch 'main' into to-sync-with-main 2024-01-03 00:11:42 +00:00
Steven Nguyen 50aab32f0f
Add search param for list subscribers endpoint 2024-01-02 23:39:46 +00:00
Khushboo Verma cfca9f232c Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-02 21:57:58 +05:30
Matej Bačo 554e9f93b6 Implement max password length 2024-01-02 10:59:35 +00:00
Khushboo Verma f14285b65b Update webhook endpoints 2024-01-02 16:17:02 +05:30
shimon 99f1543f1b Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	Dockerfile
	app/console
	app/init.php
	composer.lock
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/Hamster.php
 2024-01-02 11:49:23 +02:00
Damodar Lohani 879320e23e
update comment regarding validation 2024-01-02 11:53:48 +05:45
Damodar Lohani b2b863f09f
Merge branch 'main' into fix-chunk-upload-permission 2024-01-02 11:51:09 +05:45
Damodar Lohani a2ad870084 use compression constant from utopia/storage 2023-12-31 11:46:45 +00:00
Damodar Lohani 1c236959ba fix algorithm attribute on file if size is above read buffer size 2023-12-29 01:49:56 +00:00
Damodar Lohani 9cb5eb0180 use constants for compression type 2023-12-28 11:42:40 +00:00
Damodar Lohani a28be2bf48 return when response is sent to prevent further execution 2023-12-28 11:32:04 +00:00
Damodar Lohani 5455db7c7f improve order 2023-12-28 11:26:45 +00:00
shimon 260b280e10 preview_output_fix 2023-12-28 11:54:21 +02:00
Khushboo Verma d418a581b7 Allow only public domains in webhook url 2023-12-28 15:16:08 +05:30
Damodar Lohani 94a18ede78 fix formatting 2023-12-28 01:35:10 +00:00
Damodar Lohani e8ff828039 fix for file extension not supported 
- the error occured with jfif extension, which is essentially a jpeg file
 2023-12-28 01:31:25 +00:00
Torsten Dittmann 0fdc28e034
Merge pull request #7280 from appwrite/fix-7190-user-identity-incorrect-user 
Fix user identity attaching to wrong user
 2023-12-28 01:59:58 +01:00
Steven Nguyen f1ba7b08ab
Update the delete identity endpoints to set the params and payload 
Because no payload was set, the event params (userId and identityId)
wasn't picked up automatically. This updates the endpoints so that the
payload is set, but also makes sure to set the userId and identityId
params since the identityId param's key doesn't match the key in the
payload.
 2023-12-27 23:35:32 +00:00
Damodar Lohani cbd3e85b38 fix formatting 2023-12-25 06:07:28 +00:00
Damodar Lohani 26ac88c32e validate create permission while updating chunk uploaded file 2023-12-25 05:54:59 +00:00
Matej Bačo a0b2443a8b Rename email endpoint 2023-12-22 09:38:52 +00:00
Matej Bačo 3f1faa44ad Rename form exchange to create 2023-12-22 09:31:19 +00:00
fogelito dc203a494e Syntax change 2023-12-20 12:55:09 +02:00
Eldad Fux 90e8e04e08 Fixed test 2023-12-20 00:15:45 +01:00
Eldad Fux ed999031d0 Fixed whitespace 2023-12-19 22:46:35 +01:00
prateek banga 5d7eca7c99 lint fix and tests fix 2023-12-19 23:45:20 +05:30
loks0n 1b6a833bed fix: encode session for ssr clients 2023-12-19 15:45:44 +00:00
Eldad Fux 64138d6ccf Added new endpoint 2023-12-19 16:08:09 +01:00
Damodar Lohani 1f558442d9 linter fix 2023-12-18 10:18:40 +00:00
Damodar Lohani 5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00:00
Prateek Banga 6de2659793 adds mock providers in project for benchmarking, fixes bug in scheduling 
removes scheduling from array in schedulemessage task
 2023-12-18 15:27:09 +05:30
Jake Barnby 23b39fee02
FIx FCM tests 2023-12-17 12:41:20 +13:00
Matej Bačo 8c1363529e Add Hooks 2023-12-15 23:19:43 +01:00
Jake Barnby fc101b7c05
Update lock 2023-12-15 18:24:37 +13:00
Jake Barnby 121521d7c5
Merge remote-tracking branch 'origin/1.5.x' into json-parsing 
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/Hamster.php
 2023-12-15 18:22:08 +13:00
Jake Barnby 9c79e6bc23
Fix cache purge 2023-12-15 17:45:25 +13:00
Khushboo Verma 557565b949 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-15 01:46:47 +05:30
Khushboo Verma d5cc9d9eea Addressed PR Comments 2023-12-15 01:45:17 +05:30
fogelito 4ce312560b Connection problem 2023-12-14 18:17:19 +02:00
Jake Barnby 4e26bdb5df
Update update route params 2023-12-15 03:45:51 +13:00
Jake Barnby 7b99fab512
Use targets for cc/bcc 2023-12-15 03:19:24 +13:00
Jake Barnby 2eace5a627
Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic 
# Conflicts:
#	app/controllers/api/messaging.php
#	composer.lock
 2023-12-15 02:47:59 +13:00
Jake Barnby 91e3ea4bae
Merge pull request #7287 from appwrite/fix-list-sizes 
Fix max array size 1
 2023-12-15 02:42:45 +13:00
Jake Barnby 5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x 
# Conflicts:
#	app/config/errors.php
#	composer.lock
 2023-12-15 02:41:46 +13:00
fogelito cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Jake Barnby 944e474ec4
Fix max array size 1 2023-12-15 02:30:44 +13:00
德华 刘 dc89501012 chore: linter 2023-12-14 04:51:36 +00:00
德华 刘 1307f73c31 chore: refactor code 2023-12-14 04:49:16 +00:00
Steven Nguyen 92a307c164
Fix user identity attaching to wrong user 
Suppose a user has 2 accounts on Appwrite:

1. joe@example.com
2. joe@gmail.com

Prior to this PR, if joe@example.com created a Google OAuth2 session
using his joe@gmail.com email, a new joe@gmail.com identity would be
created linked to joe@example.com.

This is especially problematic because if the user tried to create a
Google OAuth2 session using joe@gmail.com, Appwrite would lookup the
user via email and find the joe@gmail.com user, but then find an
identity from joe@example.com. This mismatching user ID would then
cause an error.

This PR prevents an identity from being created if the email from the
OAuth2 provider matches another user's email.
 2023-12-13 18:45:05 +00:00
Luke B. Silver 60a0fefe56
Merge branch '1.4.x' into feat-ssr 2023-12-13 10:32:13 +00:00
Jake Barnby 276d671921
Add temp parsing code 2023-12-13 22:45:01 +13:00
德华 刘 f334168f90 fix: remove expired cookie 2023-12-13 08:45:47 +00:00
Khushboo Verma 16addeba10 Fixed some errors 2023-12-13 03:00:16 +05:30
shimon 41ae96ea77 change execution usage trigger 2023-12-12 21:55:01 +02:00
shimon bdf9a64771 change execution usage trigger 2023-12-12 21:21:47 +02:00
Torsten Dittmann 063db1e2bf feat: add execution aggregation to project usage 2023-12-12 18:48:21 +01:00
loks0n fda9df069a feat: enable array sdk.method 2023-12-12 11:24:50 +00:00
loks0n fe695314a9 fix: tests 2023-12-11 19:41:58 +00:00
Khushboo Verma ff7cfc6602 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-12 00:17:21 +05:30
loks0n cb788b13bf chore: remove unused imports 2023-12-11 18:36:17 +00:00
loks0n 1e8a931751 chore: format 2023-12-11 17:13:19 +00:00
loks0n 7ee4ad5ba9 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-12-11 16:52:14 +00:00
loks0n f0d7312bd3 feat: create session method 2023-12-11 16:24:24 +00:00
Torsten Dittmann 5e74c5bbc4 fix: typo usage 2023-12-11 17:12:43 +01:00
Torsten Dittmann 1794b1395a chore: run formatter 2023-12-11 16:33:15 +01:00
Torsten Dittmann ba75f69969 feat: usage breakdown by project 2023-12-11 16:19:08 +01:00
Torsten Dittmann c37e31e6c3 fix: inconsistent timestamp generation 2023-12-10 20:58:38 +01:00
Torsten Dittmann bb934080ba feat: project usage custom date range 2023-12-10 10:26:33 +01:00
Christy Jacob 4f1d8ed6f4 fix: revert files 2023-12-09 01:36:57 +01:00
Christy Jacob 951a749b50 fix: revert files 2023-12-09 01:19:36 +01:00
Christy Jacob c21a063642 fix: failing tests 2023-12-09 01:02:13 +01:00
Christy Jacob 9dca3c4300 fix: linter 2023-12-08 20:38:55 +01:00
Christy Jacob 5d121c1887 fix: reset the legacy cookie 2023-12-08 20:36:22 +01:00
Christy Jacob eb61d5c25c chore: reset old cookie 2023-12-08 20:24:07 +01:00
Christy Jacob f5c2c8d8f7 chore: reset old cookie 2023-12-08 20:23:04 +01:00
Prateek Banga b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
Torsten Dittmann 83c411e5fd fix: some fixes 2023-12-07 10:05:37 +01:00
fogelito 4af00914a5 changes 2023-12-06 16:15:21 +01:00
fogelito 2fe50717d1 TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE 2023-12-06 15:10:40 +01:00
Prateek Banga 194bbbb350 review changes 2023-12-05 19:24:55 +01:00
Prateek Banga e7dca6b2d5 adds uniform logic for worker and extra params for email 2023-12-05 15:01:32 +01:00
Prateek Banga 54f574906c review changes 2023-12-05 12:22:32 +01:00
loks0n 4471b93a3a tests: fix 2023-12-05 12:00:26 +01:00
loks0n 54c6709a48 fix: verification scopes 2023-12-04 16:17:22 +01:00
Prateek Banga f9dd40120e resolve update twilio provider 2023-12-04 15:48:37 +01:00
loks0n 63b2363556 feat: workaround backwards compat 2023-12-04 15:38:12 +01:00
prateek banga 5ed8bdae35 fix search param in list subscribers endpoint 2023-12-01 03:55:29 +05:30
prateek banga 6ead6f8094 misc changes 
allow filtering by providerType, userId in subscribers. Adds cancelled status for message status. Validate targets when creating message. delete all targets when user is deleted. fix twilio bug. add db env vars in messaging worker compose.phtml
 2023-12-01 03:39:43 +05:30
loks0n 8ea9706174 feat: Matej renaming plan 2023-11-30 11:35:52 +00:00
prateek banga 739cc36fdc updated providerType wherever left to update 2023-11-29 15:22:26 +05:30
prateek banga fa8dc133b4 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-message-provider-type 2023-11-29 15:01:47 +05:30
prateek banga 43b8fc2c31 review changes 2023-11-29 13:47:44 +05:30
Jake Barnby 4b58d08fd8
Add providerType to Message 2023-11-29 17:09:44 +13:00
Jake Barnby 82c86c0ae2
deliveryTime -> scheduledAt 2023-11-29 17:08:25 +13:00
Jake Barnby 4bc23afc65
Add constants for message types 2023-11-29 17:05:37 +13:00
prateek banga ee4c2d0e0d adds target when creating user via server endpoint 2023-11-28 18:42:34 +05:30
shimon 21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
 2023-11-26 10:28:17 +02:00
prateek banga 858175fe00 adds target object in subscriber model 2023-11-23 14:35:16 +05:30
Prateek Banga d9826cdce8 makes provider creation fields optional and adds target info in subscriber model 2023-11-23 00:39:55 +05:30
loks0n 88aa4d726c Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-21 14:54:57 +00:00
prateek banga 9c6cd8512f review changes 2023-11-21 15:19:19 +05:30
prateek banga 88f228c106 review changes 2023-11-21 15:11:09 +05:30
prateek banga 3394218cb0 adds validation for phone and email identifier 2023-11-21 15:00:02 +05:30
prateek banga 520d19e335 changes TextMagic to Textmagic in all places and uses email validator 2023-11-21 12:35:36 +05:30
Khushboo Verma 2c04c98801 Renamed webhook variables 2023-11-20 19:49:15 +05:30
Khushboo Verma 2bcb6c18fb Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-11-20 17:40:32 +05:30
Jake Barnby 0b01f7140f
Merge remote-tracking branch 'origin/main' into 1.5.x 
# Conflicts:
#	app/config/errors.php
#	composer.lock
#	src/Appwrite/Extend/Exception.php
 2023-11-21 00:19:17 +13:00
prateek banga b1eaf97806 review changes 2023-11-20 16:21:06 +05:30
prateek banga 5c1cf3a526 adds user name in subscriber response model 2023-11-20 12:34:50 +05:30
Khushboo Verma 03e8a29e8d Merge branch '1.4.x' into fix-error-logging 2023-11-18 00:02:03 +05:30
Khushboo Verma a76efe7d4e
Merge branch '1.4.x' into fix-rate-limit-error-on-large-uploads 2023-11-17 21:19:27 +05:30
Prateek Banga b68be491b9 updated description 2023-11-17 20:59:09 +05:30
Prateek Banga 9183f2a875 changes enum size validation in update controller 2023-11-17 20:56:18 +05:30
Khushboo Verma 2a2ff34e20 Merge branch '1.4.x' into fix-error-logging 2023-11-17 20:37:36 +05:30
Prateek Banga ab35b75c37 fix test message 2023-11-17 20:14:55 +05:30
Prateek Banga 228b813994 fixes test case 2023-11-17 20:06:28 +05:30
Khushboo Verma 93f58fb876 Merge branch '1.4.x' into fix-error-logging 2023-11-17 19:30:58 +05:30
Khushboo Verma 7902defe69 Addressed PR comments 2023-11-17 19:29:57 +05:30
Prateek Banga 827ad84f53 fixes adding longer length enum 2023-11-17 19:09:31 +05:30
Khushboo Verma c34dc4dae0 Add flag to send logs to logger 2023-11-16 23:51:09 +05:30
Khushboo Verma fccbe405db Add chunkId to abuse key to prevent rate limit for SDKs 2023-11-16 23:04:38 +05:30
prateek banga 7536d8eb0f review changes 2023-11-16 17:09:08 +05:30
prateek banga bf95736da0 review changes 2023-11-16 16:47:36 +05:30
prateek banga f854622705 review changes 2023-11-16 16:26:36 +05:30
prateek banga a282ab38a6 adds target endpoint in account controller for push tokensl 2023-11-16 02:12:06 +05:30
prateek banga c24664f5d9 removes internal provider 2023-11-16 01:30:47 +05:30
Torsten Dittmann 115ca23a58
Merge pull request #5174 from yatharth1706/fix-4797-verified-user-getting-email-verifications 
Fix verified user getting email verifications
 2023-11-15 13:35:23 +01:00
loks0n 830544e245 fix: logged in ssr cases 2023-11-15 11:57:27 +00:00
prateek banga 2aa8391c5e review fixes 2023-11-15 12:52:27 +05:30
Khushboo Verma 2e70ed59af Fix git installation deletion 2023-11-15 11:41:42 +05:30
prateek banga fdca55b0de fix test cases 2023-11-15 01:24:55 +05:30
prateek banga adc76c5797 adds target when account is created or email or phone is updated 2023-11-14 22:46:20 +05:30
prateek banga 1870524be5 fixes error name 2023-11-14 21:34:17 +05:30
Matej Bačo 7e1b618769 Fix permission issues with repositories collection 2023-11-14 16:50:59 +01:00
Khushboo Verma 141b864a56 Update permissions for create repository document 2023-11-14 19:49:23 +05:30
loks0n 7823b90bf3 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-14 14:01:10 +00:00
prateek banga 7ae614fe13 adds provider type in target 2023-11-14 18:14:07 +05:30
prateek banga c5aaa670a9 adds provider details in message search attribute 2023-11-14 15:20:21 +05:30
Khushboo Verma 22f02243c6 Resolved merge conflicts 2023-11-14 14:29:46 +05:30
Khushboo Verma 3f584b85be Limit webhook failure attempts to 10 2023-11-14 14:20:26 +05:30
prateek banga f84a00dded adds search attribute filter 2023-11-14 14:07:52 +05:30
prateek banga 8f53301209 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into more_review_changes 2023-11-14 12:26:35 +05:30
Matej Bačo 967854d34a Fix grammar 2023-11-13 14:39:33 +01:00
Matej Bačo a029287e5a Implement health tresholds 2023-11-13 14:07:11 +01:00
Jake Barnby 458c2d1446
Merge remote-tracking branch 'origin/main' into chore-sync-main 2023-11-13 16:46:05 +13:00
Prateek Banga 4f681cfe10
Merge branch '1.5.x' into chore-sync-main-1.5.x 2023-11-10 23:12:40 +05:30
Prateek Banga 3ade88897c Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x 2023-11-10 12:49:05 +05:30
Prateek Banga 76ed15f2a1 adds more assertion in logs tests 2023-11-10 02:20:55 +05:30
Christy Jacob d33b8c2ce1
Merge branch '1.4.x' into fix-null-password-history 2023-11-09 07:44:44 -08:00
Bradley Schofield 56310bc4fa
Merge branch 'main' into fix-null-password-history 2023-11-09 10:41:17 +00:00
Prateek Banga 3654799cc7 links ISO 8601, move params in messaging controllers 2023-11-09 14:53:42 +05:30
Prateek Banga 4c970cbc46
Merge branch '1.5.x' into feat-logs-messaging-api 2023-11-09 13:42:51 +05:30
Prateek Banga 8d5bfdabc6 revert wrong aduits.event label 2023-11-09 12:29:16 +05:30
Steven Nguyen 0c264a107a
Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications 2023-11-08 17:37:43 -08:00
Eldad A. Fux d64d56069f
Merge pull request #6828 from appwrite/feat-improve-migration-validations 
Improve Error Handling and Add more Validation
 2023-11-08 16:03:04 -05:00
prateek banga b9de4a0169 added tests for logs endpoint 2023-11-08 23:26:46 +05:30
shimon d54615d376 project.php 2023-11-08 18:12:36 +02:00
Bradley Schofield 54e5985940 Fix wrong operator for password history 
This fixes a potential chance for nulls to be introduced into the password history array when $password is null and $passwordHistory != 0
 2023-11-08 14:35:16 +00:00
shimon dd9d8010c1 db health api throws an error when ping fails 2023-11-08 15:20:50 +02:00
shimon ad63a377ab added inf metric 2023-11-08 11:09:32 +02:00
Christy Jacob fd7b354113
Merge pull request #7084 from appwrite/fix-proxy-create-rule-500 
fix: proxy create rule 500
 2023-11-07 10:49:52 -08:00
Christy Jacob 8feb01d857
Merge pull request #7085 from appwrite/fix-missing-sessionId-error 
fix: missing sessionId error
 2023-11-07 10:43:05 -08:00
Christy Jacob 2d2400fdff
Merge branch '1.4.x' into fix-missing-sessionId-error 2023-11-07 10:27:46 -08:00
Christy Jacob f4cdd0accc
Merge branch '1.4.x' into fix-proxy-create-rule-500 2023-11-07 10:27:31 -08:00
德华 刘 9acc23049c Merge branch 'main' of https://github.com/appwrite/appwrite into sync-1.4.x-main 2023-11-07 18:12:58 +00:00
Christy Jacob f53fbc19d4
Merge branch '1.4.x' into fix-missing-functionId-error 2023-11-07 10:10:03 -08:00
Bradley Schofield d5d7440a68 Merge branch 'main' into feat-improve-migration-validations 2023-11-07 16:21:35 +00:00
loks0n 7e37c973ce fix: missing functionId error on create execution 2023-11-07 10:25:33 +00:00
Steven Nguyen 55a73efeab Ensure usage endpoints don't throw 500 when usage is disabled 2023-11-06 21:28:45 +00:00
loks0n dfc8c919d4 fix: missing sessionId error 2023-11-06 15:06:56 +00:00
loks0n 75669b9b2e chore: better error msg 2023-11-06 14:49:33 +00:00
loks0n 4440859c05 chore: fmt 2023-11-06 14:48:54 +00:00
loks0n 61c5f371b7 chore: use base Exception 2023-11-06 14:45:56 +00:00
loks0n 8b24c44fb9 fix: proxy create rule 500 2023-11-06 14:44:00 +00:00
shimon f64d0ab8a8 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	composer.lock
	src/Appwrite/Migration/Migration.php
 2023-11-05 17:03:13 +02:00
Steven Nguyen 9f7bbe4869 Fix the Health service's get X queue endpoints 
Before this, the endpoints called $client->sumProcessingJobs() which
only gets the currently processing jobs, but this endpoint should return
what's currently in queue, pending to be processed. This should be
retrieved using $client->getQueueSize().
 2023-11-03 16:57:30 +00:00
Christy Jacob 9fc7c1384a
Merge pull request #7071 from appwrite/fix-swoole-warning 
feat: fix swoole warning
 2023-11-03 19:46:59 +04:00
loks0n 305c781206 feat: fix swoole warning 2023-11-03 12:18:24 +00:00
loks0n df0271c56a chore: rename to 'custom' sessions 2023-11-02 13:22:10 +00:00
loks0n 9206390d01 feat: custom expire paramter createTokenSession 2023-11-02 12:52:43 +00:00
Prateek Banga f97d1fa9e3 adds log api in messaging controller 2023-11-02 18:00:17 +05:30
Prateek Banga 61d46bee5c Merge branch '1.5.x_review_changes' of https://github.com/appwrite/appwrite into event-label-messaging 2023-11-02 16:53:55 +05:30
Prateek Banga 270e6e7c15 review changes 2023-11-02 16:43:24 +05:30
Bradley Schofield e158d134b0 Merge branch 'main' into feat-improve-migration-validations 2023-11-02 10:48:38 +00:00
shimon 1c1028412a refactor users, project, functions usage display 2023-11-01 20:44:06 +02:00
shimon 04290730b2 refactor storage, databases usage display 2023-11-01 17:20:12 +02:00
prateek banga fda4e6a8bd fixes typo in event label 2023-11-01 14:33:13 +05:30
Prateek Banga 2aa5c5742b remove unnecessary injection 2023-11-01 12:09:00 +05:30
prateek banga f7529140bd adds event label to remaining messaging api 2023-10-31 23:53:46 +05:30
Prateek Banga a719c3f46b adds event label to create providers endpoint 2023-10-31 23:17:58 +05:30
loks0n af0d689aff feat: sessions scope 2023-10-31 15:05:02 +00:00
loks0n 4559cf77e9 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-31 12:08:48 +00:00
Christy Jacob 9fded16d3f
Merge pull request #7053 from appwrite/1.4.x 
Sync main with 1.4.x
 2023-10-31 12:27:08 +04:00
prateek banga a01d361886 review changes 2023-10-31 01:12:31 +05:30
prateek banga 06daa544e8 review changes 2023-10-30 23:37:57 +05:30
德华 刘 744f2fbc1c chore: update project creation database allocation 2023-10-30 14:46:54 +00:00
Christy Jacob e17bb94e39
Merge pull request #6495 from appwrite/fix-mails 
Fix certificate emails and add support for variables in email template subject
 2023-10-27 19:17:50 +04:00
Khushboo Verma cba20d8b96 Addressed PR comments 2023-10-27 19:38:33 +05:30
Prateek Banga bc6df4bab7 add recipients array check in API instead of worker 2023-10-27 13:42:27 +05:30
Steven Nguyen 836ce852ed
Refactor email templates 
Update the mails worker to only be responsible for building the final
email using the base (layout) template and the user, team, project, and
redirect variables.

It is the responsibility of the controller to perform localization and
determine whether a custom or default email template should be used.
If the default one is used, it has to be rendered using the hello,
footer, thanks, and signature variables so that it matches the custom
template. Then, it can be sent to the worker.
 2023-10-26 16:47:14 -07:00
Steven Nguyen 3206cee36f
Leave user placeholder in default email template 
This matches up with the default template and gives the developer an
idea about the available variables and how to use them.
 2023-10-26 16:23:58 -07:00
Steven Nguyen 70a3820009
Remove unused mail vars 2023-10-26 16:23:58 -07:00
Prateek Banga 5a9b1f0c24 removes provider from topics 2023-10-26 19:44:06 +05:30
loks0n 49425fb8fc test: fix 2023-10-26 15:04:47 +01:00
prateek banga c2cd544948 review changes 2023-10-26 13:46:45 +05:30
Prateek Banga 34b3ed68ee adds total count for subscribers in topics model 2023-10-26 12:37:39 +05:30
prateek banga f6f4397aab Merge branch 'providers-from-attribute' of https://github.com/appwrite/appwrite into review-changes-1.5.x 2023-10-25 23:55:45 +05:30
prateek banga 887eeef585 review changes 2023-10-25 23:09:38 +05:30
prateek banga fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
loks0n b4773a7fbd Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-25 13:20:42 +01:00
loks0n 3a9202a46b chore: christy feedback 2023-10-25 13:20:29 +01:00
shimon 4c6976488c clean up 2023-10-25 15:06:54 +03:00
shimon b775c53666 clean up 2023-10-25 13:16:25 +03:00
shimon c11b3ff522 workers start hook 2023-10-25 12:46:45 +03:00
shimon b7675df9b9 usage workers 2023-10-25 11:38:44 +03:00
shimon 9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
Jake Barnby d5b6421285
Merge remote-tracking branch 'origin/1.4.x' into sync-1.4.x-to-1.5.x 
# Conflicts:
#	composer.lock
 2023-10-24 19:46:57 +13:00
prateek banga b60cbcada5 adds from field in remaining providers 2023-10-24 01:05:46 +05:30
loks0n a67ca55af5 fix: use queueForEvents in users 2023-10-23 11:32:09 +01:00
Khushboo Verma 2cf8639b68 Resolve merge conflicts 2023-10-23 15:06:01 +05:30
德华 刘 3dee8d6ecd fix: update incorrect method call 2023-10-23 08:34:57 +00:00
Shimon Newman 808f682fa7
Update app/controllers/api/projects.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2023-10-23 11:25:31 +03:00
shimon 2ef8490691 fix mod condition 2023-10-23 11:22:28 +03:00
loks0n 1343d4851a Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-23 09:10:57 +01:00
shimon b09a254d3c fix mod condition 2023-10-23 10:46:15 +03:00
shimon a841734d50 fix mod condition 2023-10-23 01:05:10 +03:00
shimon ac231914d4 fix mod condition 2023-10-23 00:55:57 +03:00
shimon 0d5127d90b fix mod condition 2023-10-23 00:08:55 +03:00
德华 刘 00d2a5ffcd chore: update create projects endpoints 2023-10-22 18:33:15 +00:00
德华 刘 79612bd80f Merge branch 'main' of https://github.com/appwrite/appwrite into feat-sm-db 2023-10-22 18:30:14 +00:00
prateek banga af40c63357 review changes 2023-10-20 17:02:13 +05:30
prateek banga 6c260223ba Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 15:00:22 +05:30
prateek banga 161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
Prateek Banga d714760eb8 review changeS 2023-10-20 13:51:13 +05:30
prateek banga 24b2d70441 review changes 2023-10-20 13:33:27 +05:30
prateek banga e4d2d15f70 review changes 2023-10-20 13:31:56 +05:30
prateek banga db9e7b0199 review changes 2023-10-20 13:28:23 +05:30
Christy Jacob 21b9716bb2
Merge pull request #6959 from appwrite/chore-update-backup-timings 
chore: update backup timings
 2023-10-19 20:40:43 +04:00
德华 刘 de8b9638d5 chore: update backup timings 2023-10-19 16:07:54 +00:00
shimon 8048766d28 queues fixes 2023-10-19 18:28:01 +03:00
Christy Jacob 01e842782f
Merge branch '1.4.x' into feat-1.4.6-release-prep 2023-10-19 05:28:02 -04:00
Christy Jacob 18dc8749d5 chore: update health API 2023-10-19 09:25:38 +00:00
prateek banga 99b5ac8669 adds push and sms controllers 2023-10-19 13:29:48 +05:30
Jake Barnby 354211950f
Add timeout test 2023-10-19 17:06:57 +13:00
Jake Barnby b6b8fe7d51
Allow overriding timeout per request in dev mode 2023-10-19 16:19:40 +13:00