Commit graph

338 commits

Author SHA1 Message Date
prateek banga
c2cd544948 review changes 2023-10-26 13:46:45 +05:30
prateek banga
fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
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
shimon
0411f9f530 fix function-worker body param typo 2023-10-23 16:33:26 +03:00
Torsten Dittmann
d19baafc59 chore: fix linting 2023-10-20 14:43:48 +02:00
Torsten Dittmann
4f77510b0a fix: only apply hook flags to mails worker 2023-10-20 14:42:22 +02:00
Torsten Dittmann
1f97aaf591 fix: disable swoole tcp hook for mails worker 2023-10-20 14:40:59 +02:00
prateek banga
af40c63357 review changes 2023-10-20 17:02:13 +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
shimon
dd47ef4fd9 email template path 2023-10-19 20:57:24 +03:00
Christy Jacob
be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
Christy Jacob
4724d729fb Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes 2023-10-18 18:59:51 +00:00
Christy Jacob
066dd6393d Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes 2023-10-18 18:57:16 +00:00
Christy Jacob
72d0865ad8 chore: use deletes worker for deleting audit logs 2023-10-18 18:54:20 +00:00
Christy Jacob
688f2e5a56 Merge branch 'refactor-workers-sn' of github.com:appwrite/appwrite into remove-obsolete-tasks 2023-10-18 22:19:52 +04:00
shimon
8a52dc3485 some fixes 2023-10-18 20:21:39 +03:00
Christy Jacob
050cb28d4f fix: incorrect events 2023-10-18 20:30:47 +04:00
Christy Jacob
33ec5b3d7b chore: re-order tests 2023-10-18 02:36:50 +04:00
Christy Jacob
685a953705 Merge branch 'refactor-workers-sn' of github.com:appwrite/appwrite into remove-obsolete-tasks 2023-10-17 23:30:44 +04:00
Christy Jacob
617ded14aa chore: cleanup obsolete CLI tasks 2023-10-17 23:30:11 +04:00
Christy Jacob
7806cf1b55 chore: cleanup obsolete CLI tasks 2023-10-17 23:29:25 +04:00
shimon
1036cb406d some fixes 2023-10-17 21:32:38 +03:00
Matej Bačo
8b6d050b0d Fix failing event tests 2023-10-17 18:23:10 +02:00
shimon
e8dbd043ec addressing some comments 2023-10-17 07:02:54 +03:00
shimon
9a6d88a819 addressing some comments 2023-10-17 06:44:36 +03:00
Jake Barnby
dbfe5e45aa
Delegate custom deletes 2023-10-17 12:18:51 +13:00
shimon
2fcda9fc11 Merge branch 'cl-1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn 2023-10-16 17:03:43 +03:00
shimon
94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Christy Jacob
d8714ec3fa fix: rename domains collection to rules in hamster script 2023-10-13 12:54:10 +04:00
Christy Jacob
b3d8998735 chore: update hamster script 2023-10-13 12:29:03 +04:00
shimon
1c8b38502a sync with main 2023-10-11 17:07:06 +03:00
shimon
893b1d0ba7 Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.gitmodules
	app/controllers/api/functions.php
	app/controllers/api/health.php
	app/init.php
	app/views/install/compose.phtml
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Workers/Builds.php
	src/Appwrite/Platform/Workers/Deletes.php
	src/Appwrite/Platform/Workers/Functions.php
	src/Executor/Executor.php
2023-10-11 12:08:13 +03:00
shimon
948f36a023 sync with 1.4 2023-10-05 16:15:39 +03:00
shimon
a643a8c907 sync with 1.4 2023-10-04 13:43:21 +03:00
shimon
e3668a4d06 sync with 1.4 2023-10-03 21:56:36 +03:00
shimon
429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
shimon
3b00e396d5 sync with main 2023-10-03 15:15:13 +03:00
shimon
6d60b0bd8c sync with 1.4 2023-10-03 11:40:34 +03:00
shimon
2bb4d8fb89 sync with 1.4 2023-10-02 17:02:48 +03:00
shimon
75d8741eaa sync against master 2023-10-01 21:30:52 +03:00
shimon
b1da87f970 migrations worker 2023-10-01 21:06:25 +03:00
shimon
b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
shimon
47d27096db deletes & databases workers 2023-10-01 11:04:12 +03:00
shimon
9cf83151cd certificates worker 2023-09-28 20:37:07 +03:00
shimon
a10246a9bd build && audit && usage workers 2023-09-28 13:45:15 +03:00
shimon
dcf0107a79 sync with master 2023-09-27 20:10:21 +03:00
shimon
c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Christy Jacob
79d7bd8379 chore: linter 2023-09-26 00:10:17 +04:00
Christy Jacob
39dc153a22 chore: remove comments 2023-09-26 00:05:01 +04:00
Christy Jacob
d4debddc46 chore: update hamster script 2023-09-26 00:01:42 +04:00
Christy Jacob
d1d523e1dc chore: update hamster script 2023-09-26 00:01:34 +04:00
Matej Bačo
8926d24a0d One more env var rename 2023-09-19 09:35:32 +02:00
Matej Bačo
d87dbad768 PR review changes 2023-09-19 09:31:57 +02:00
Matej Bačo
6a7950aa34 Add function domains force https 2023-09-18 12:27:47 +02:00
Jake Barnby
9ba609c46e
Merge pull request #6238 from appwrite/1.4.x
1.4.x
2023-09-15 18:49:55 -04:00
Christy Jacob
bede0d43d4 fix: add try catch block in the schedules task 2023-09-15 05:24:00 +00:00
Christy Jacob
50405f838e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into chore-cleanup-dockerfile 2023-09-14 18:07:53 +00:00
Jake Barnby
d4f6b99ee2
Fix mock enum endpoint 2023-09-07 19:25:42 -04:00
Christy Jacob
53b1c87c6e
Merge pull request #6141 from appwrite/fix-overwrite-executor-variable
Fix _APP_EXECUTOR_HOST for upgrades
2023-09-05 19:35:31 -04:00
Steven Nguyen
4c90b6bb1c
Add required params for scheduled functions 2023-09-04 17:02:17 -07:00
Steven Nguyen
3c7c44adda
Fix _APP_EXECUTOR_HOST for upgrades
As of 1.4.0, the hostname of the executor should be executor rather than
appwrite-executor. The problem is our install command always uses the
existing installation's variable values as the default for the upgrade.
This means the _APP_EXECUTOR_HOST will retain it's old value.

This PR Adds an overwrite key to variables.php to allow overwriting the
variable value regardless of whatever was in the previous installation.
2023-09-04 11:06:43 -07:00
Christy Jacob
31a7cca906 chore: add missing env variable 2023-09-01 17:08:51 -04:00
Steven Nguyen
dcc676a0c9
Make install confirmation case insensitive
When a previous installation is found during installation/upgrade, the
user is prompted to confirm whether they want to overwrite it. We
originally only accepted 'Y', but this PR changes it to accept 'y' as
well to reduce friction.
2023-08-31 12:25:42 -07:00
Steven Nguyen
917f2f1d74
Update installation confirmation text
Let the user know a backup will be created.
2023-08-30 12:32:10 -07:00
Steven Nguyen
2f2edd41d5
Update install.php not specify docker-compose.yml file
By not specifying a docker-compose.yml file, docker compose
automatically uses the docker-compose.yml file in the project directory
and a docker-compose.override.yml file if one is present.
2023-08-30 10:17:37 -07:00
Steven Nguyen
7d56c6f37e
Prompt developer to confirm installing over existing install 2023-08-30 09:55:27 -07:00
Steven Nguyen
75f7459c40
Create a dedicated upgrade task
Before, we used the same command for both installation and upgrades.
This lead to problems because developers would try to upgrade in the
wrong folder and end up creating a new installation.

This new upgrade command validates the existence of an existing
installation before proceeding with the upgrade to ensure no new
installation is created when upgrading.
2023-08-30 09:55:18 -07:00
Steven Nguyen
48f0ff86ba
Make the install path a class property
This makes it so the property can be used by subclasses.
2023-08-30 09:50:47 -07:00
Torsten Dittmann
48c5a09b4f fix: string interpolation 2023-08-30 11:21:28 +02:00
Jake Barnby
ece93a14e5
Fix install task 2023-08-28 18:09:37 -04:00
Matej Bačo
8802e318d5 Fix pools resource 2023-08-23 13:52:17 +02:00
Steven Nguyen
f3fbb2fb56
Fix Migration task after it was converted to a Platform task 2023-08-21 15:53:30 -07:00
shimon
e86286e7e3 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
 Conflicts:
	composer.lock
2023-08-20 18:07:57 +03:00
shimon
8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Matej Bačo
dedacecb52 Enable coroutines for VCS, upgrade version to 1.4 2023-08-20 10:46:44 +02:00
Matej Bačo
906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Matej Bačo
ac2ca267d7 Address more PR reviews 2023-07-31 08:47:47 +02:00
shimon
1fd7f0c5d7 SSl task 2023-07-18 10:54:11 +03:00
Shimon Newman
1358d6c455
Update src/Appwrite/Platform/Workers/Audits.php
Co-authored-by: Damodar Lohani <lohanidamodar@users.noreply.github.com>
2023-07-10 11:13:35 +03:00
shimon
89f0146c45 users addition 2023-07-10 11:03:59 +03:00
Damodar Lohani
f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
shimon
e9f8a33515 users addition 2023-06-20 13:28:26 +03:00
shimon
48bf74b881 users addition 2023-06-20 13:24:26 +03:00
Christy Jacob
702c92fb5d
Merge pull request #5728 from appwrite/fix-hamster-script
fix: missing collection error
2023-06-19 20:26:21 +05:30
shimon
38cf901579 fix 2023-06-19 17:30:21 +03:00
Christy Jacob
b56603958a chore: linter 2023-06-19 13:41:37 +00:00
Christy Jacob
4d7611f569 fix: missing collection error 2023-06-19 13:28:43 +00:00
shimon
9ff6faa2d2 fix 2023-06-19 15:50:48 +03:00
shimon
5e836691e2 fix 2023-06-19 13:55:16 +03:00
shimon
0a92e3dc55 fix 2023-06-19 13:54:04 +03:00
shimon
9179a70992 fix 2023-06-19 13:37:16 +03:00
shimon
e633389707 delete unnecessary project collections task 2023-06-15 15:45:40 +03:00
shimon
428e9e73fe delete unnecessary project collections task 2023-06-15 11:59:43 +03:00
shimon
ce596b2f2b delete unnecessary project collections task 2023-06-15 11:53:19 +03:00
shimon
f5e9094bdc delete unnecessary project collections task 2023-06-15 09:51:11 +03:00
shimon
579a95aecc delete unnecessary project collections task 2023-06-14 19:21:48 +03:00
shimon
3286279d3c delete unnecessary project collections task 2023-06-14 19:01:34 +03:00
shimon
f2705c30a3 delete unnecessary project collections task 2023-06-14 18:59:46 +03:00
shimon
7196114339 delete unnecessary project collections task 2023-06-14 18:58:29 +03:00
shimon
2432210bbb delete unnecessary project collections task 2023-06-14 17:45:18 +03:00
shimon
e225bbe3c9 delete unnecessary project collections task 2023-06-14 17:42:23 +03:00
shimon
57bc7d0584 functions/builds/deletes worker 2023-06-11 17:08:48 +03:00
shimon
fd4f86b1c1 functions/builds/deletes worker 2023-06-11 13:29:04 +03:00
shimon
62c619434e functions/builds/deletes worker 2023-06-05 19:13:00 +03:00
shimon
d820d93ac7 databases worker 2023-06-04 19:25:56 +03:00
shimon
0d2987620c refactor workers 2023-06-04 11:19:49 +03:00
shimon
6e7c160249 changing event signature 2023-06-02 06:54:34 +03:00
shimon
0fd7db3c36 addressing comments 2023-05-30 20:11:25 +03:00
shimon
9ac4a2bfd5 minor fix 2023-05-30 18:46:36 +03:00
shimon
8ce6d38922 minor fix 2023-05-30 18:30:15 +03:00
shimon
da75a2e409 calc tier stats 2023-05-30 18:13:30 +03:00
shimon
1225c8b7c3 calc tier stats 2023-05-30 18:06:51 +03:00
shimon
73f3f0aee6 Messaging 2023-05-30 16:19:44 +03:00
shimon
478e83a4bf Messaging 2023-05-30 11:53:52 +03:00
shimon
06ca9ce815 Messaging 2023-05-29 19:32:33 +03:00
shimon
5a22d17459 Mails 2023-05-29 18:03:09 +03:00
shimon
f1466c05cf refactor workers 2023-05-29 16:58:45 +03:00
shimon
ef35526a69 downgraded csv writer ver 2023-05-24 21:52:08 +03:00
shimon
ab83dfedac downgraded csv writer ver 2023-05-24 21:38:35 +03:00
shimon
d7b32cfc3e downgraded csv writer ver 2023-05-24 21:36:08 +03:00
shimon
77971a4eb5 downgraded csv writer ver 2023-05-24 21:27:06 +03:00
shimon
99b56b3584 downgraded csv writer ver 2023-05-24 12:17:14 +03:00
shimon
3545e0740f downgraded csv writer ver 2023-05-23 21:02:23 +03:00
shimon
5163ce7cc9 calculating users per project task 2023-05-23 19:46:45 +03:00
shimon
e79cb913ed calculating users per project task 2023-05-23 18:58:49 +03:00
shimon
432ee72071 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	app/cli.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/teams.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	src/Appwrite/Event/Event.php
	src/Appwrite/Event/Mail.php
2023-05-22 18:41:24 +03:00
Matej Bačo
998c2749cb Merge branch 'feat-db-pools-master' into feat-executor-v3 2023-05-11 21:59:49 +02:00
Matej Bačo
56172ac196 Update ClearCardCache.php 2023-05-02 13:35:53 +02:00
Matej Bačo
b9efa52a92 Revert changes 2023-05-02 13:25:38 +02:00
Matej Bačo
ecbc9aecb3 Migrated cache buster to a script 2023-05-02 13:21:08 +02:00
Christy Jacob
d87e198913 feat: upgrade hamster script 2023-04-20 16:00:50 +04:00
Damodar Lohani
41d22fb50b Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2 2023-03-30 08:02:31 +00:00
Christy Jacob
5f10ff4d3b Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools-sync 2023-03-24 06:35:30 +00:00
Christy Jacob
55e53abcfc
Merge pull request #5268 from appwrite/upgrade-hamster-script
feat: update appwrite image
2023-03-23 15:55:45 +05:30
Christy Jacob
f6ae33aeba feat: update appwrite image 2023-03-23 14:23:49 +04:00
Christy Jacob
ffa683e932
Merge pull request #5267 from appwrite/upgrade-hamster-script
feat: fix hamster script
2023-03-23 13:55:19 +05:30
Christy Jacob
65c6123ccd feat: fix hamster script 2023-03-23 12:22:38 +04:00
Christy Jacob
bafe948578
Merge pull request #5247 from appwrite/feat-db-pools-master-schduler-fix
Fix: scheduler env variables
2023-03-23 01:16:06 +05:30
Matej Bačo
567cb01b99 add reclaim logic 2023-03-22 20:35:04 +01:00
Matej Bačo
cf39092c98 Add patch task for scheduleUpdatedAt 2023-03-22 19:52:43 +01:00
Christy Jacob
9723792a29 feat: add new stats 2023-03-22 20:22:56 +04:00
Christy Jacob
07e3a29b63 feat: add new stats 2023-03-22 20:19:28 +04:00
Christy Jacob
6c15326f8f feat: add new stats 2023-03-22 20:18:23 +04:00
Christy Jacob
deab7caed9 feat: update docker image 2023-03-20 15:57:14 +05:30
Christy Jacob
f951da2f55 feat: update hamster scrpipt 2023-03-20 14:30:24 +05:30
Christy Jacob
39388e9b92 feat: use env vars for the hamster time 2023-03-20 12:58:11 +05:30
Christy Jacob
7e06115686 feat: remove unused csv library 2023-03-20 11:44:43 +05:30
Christy Jacob
a164991c75 feat: linter 2023-03-17 21:44:29 +05:30