1
0
Fork 0
mirror of synced 2024-08-02 12:01:37 +12:00
Commit graph

1229 commits

Author SHA1 Message Date
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
Steven Nguyen
3addf76a2a Bump appwrite version to 1.4.7 2023-10-23 13:36:29 -07:00
prateek banga
e040ecba36 fixed lint error 2023-10-20 15:03:56 +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
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
4b08729131
Update app/init.php 2023-10-19 05:27:52 -04:00
Christy Jacob
a46b3d088c
Merge branch '1.4.x' into feat-api-db-timeout 2023-10-19 05:15:44 -04:00
Jake Barnby
03b6d65669
Add timeout on vcs project DBs 2023-10-19 17:21:11 +13:00
Jake Barnby
b17e24f645
Use const for timeout 2023-10-19 15:45:32 +13:00
Jake Barnby
389d367fca
Set hard timeouts for API dbs 2023-10-19 15:32:45 +13:00
Steven Nguyen
435b20df77
Bump appwrite version to 1.4.6 2023-10-18 16:07:47 -07:00
Steven Nguyen
9bc6b124c0
Bump console to version 3.2.3 2023-10-18 15:51:13 -07:00
Christy Jacob
be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
Christy Jacob
74e3f3f7d2 fix: remove unused variable 2023-10-18 19:08:21 +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
shimon
1036cb406d some fixes 2023-10-17 21:32:38 +03:00
Prateek Banga
ffeb3f8fcf review work 2023-10-17 22:53:26 +05:30
Jake Barnby
dbfe5e45aa
Delegate custom deletes 2023-10-17 12:18:51 +13:00
shimon
94178f8eaf rollback to Usage 2023-10-15 20:41:09 +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
Prateek Banga
bb52647366 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-10 19:06:39 +05:30
Prateek Banga
1e5a2a78aa Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.5.x-with-1.4.x 2023-10-10 17:46:44 +05:30
Steven Nguyen
071920fb30
Bump version to 1.4.5 2023-10-09 16:39:46 -07:00
Steven Nguyen
2620328810
Bump APP_CACHE_BUSTER to make sure browsers fetch the new console 2023-10-09 16:38:54 -07:00
Prateek Banga
d842191cc6 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-06 03:53:16 +05:30
Prateek Banga
d5cc214546 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x 2023-10-06 03:44:36 +05:30
shimon
7f1507f810 sync with 1.4 2023-10-04 11:20:32 +03:00
shimon
75d8741eaa sync against master 2023-10-01 21:30:52 +03:00
shimon
b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
Christy Jacob
0c2cd174a5 chore: prep for 1.4.4 2023-09-27 21:28:28 +00: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
Prateek Banga
35d842171c review changes 2023-09-20 23:37:10 +05:30
Prateek Banga
f9030132a5 messaging worker logic to send message to providers batch limit 2023-09-20 17:38:29 +05:30
Prateek Banga
a2e34b5b64 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-20 16:59:07 +05:30
Christy Jacob
27b58fdf1e chore: increase cache buster 2023-09-14 20:06:10 +00:00
Christy Jacob
1e6b37f980 chore: update appwrite version 2023-09-14 19:53:32 +00:00
Prateek Banga
350549db7d Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-14 02:17:34 +05:30
Prateek Banga
dbd227ed50 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-09-14 02:13:27 +05:30
prateek banga
778056d8e0 Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-13 17:08:37 +05:30
Jake Barnby
1f9872b398
Merge remote-tracking branch 'origin/1.5.x' into feat-add-messaging-response-models 2023-09-12 15:40:25 -04:00
Prateek Banga
d14fbde9e7 removes provider sub query 2023-09-13 00:40:51 +05:30
Prateek Banga
720c7300dc Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-12 22:06:31 +05:30
Prateek Banga
497586378f removes unnecessary config load 2023-09-12 22:05:14 +05:30
Prateek Banga
a69368973b Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-12 21:31:06 +05:30
Prateek Banga
d14a4c2506 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-12 21:23:18 +05:30
Prateek Banga
2f2875e3c0 lint fix 2023-09-12 21:19:21 +05:30
Prateek Banga
b7119a2718 review changes 2023-09-12 21:03:44 +05:30
Prateek Banga
cbea4264ea merge master 2023-09-12 20:53:16 +05:30
Prateek Banga
899c962061 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-11 20:30:30 +05:30
Prateek Banga
f4f1aa4b5b review changes and adds missing subqueries 2023-09-11 19:27:45 +05:30