1
0
Fork 0
mirror of synced 2024-06-27 18:50:47 +12:00
Commit graph

726 commits

Author SHA1 Message Date
Jake Barnby 3f3d518f36
Merge remote-tracking branch 'origin/1.4.x' into feat-git-integration
# Conflicts:
#	docker-compose.yml
2023-08-29 14:40:46 -04:00
prateek banga d1e6f1b535 update assistant version 2023-08-28 15:00:42 +05:30
prateek banga 655f7b7563 updates appwrite assistant docker image version 2023-08-28 14:08:21 +05:30
Khushboo Verma 9fcfca78f8 Remove GitHub signup env variables from docker-compose 2023-08-25 13:17:51 +05:30
Matej Bačo 293e44e91e Introduce SMTP ping timeout 2023-08-24 13:04:49 +02:00
Matej Bačo fce0a9d4ca Re-add env vars 2023-08-24 10:28:30 +02:00
Jake Barnby 55deaec8b2
Fix missing env 2023-08-23 17:53:24 -04:00
Khushboo Verma ff2ec8a93b Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-24 01:09:40 +05:30
Khushboo Verma 46852392b3 Added github console env variables to docker-compose 2023-08-24 01:09:02 +05:30
Jake Barnby 0a5b0fa06b
Fix functions worker crash 2023-08-23 15:08:26 -04:00
Matej Bačo 8802e318d5 Fix pools resource 2023-08-23 13:52:17 +02:00
Matej Bačo d3a9766c4f Sync env & storage setup with 1.4.x 2023-08-23 12:08:48 +02:00
Matej Bačo 4fbb98b705 upgrade executor 2023-08-22 17:20:23 +02:00
Eldad A. Fux 8e46bdf7cb
Merge branch 'feat-git-integration' into feat-usage-rollback 2023-08-21 22:46:09 +03:00
Matej Bačo 7c184498bb Fix GitHub app auth and migrations 2023-08-21 15:16:02 +02:00
Bradley Schofield 9418ba8775
Update docker-compose.yml 2023-08-21 13:43:21 +01: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 60d24e0072 Downgrade assistant 2023-08-20 11:42:17 +02:00
Matej Bačo 46c7010908 Uprade dependencies 2023-08-20 11:04:42 +02:00
Matej Bačo 20a2d3755e Add vars for Console 2023-08-20 10:10:42 +02:00
Matej Bačo efe3793679 PR review changes, fix node test 2023-08-19 20:26:47 +02:00
Matej Bačo 69cf0161ff Fix more tests 2023-08-19 10:05:49 +02:00
Jake Barnby a848322687
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# 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.json
#	composer.lock
2023-08-18 13:23:35 -04:00
Jake Barnby a88f90dd90
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# 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
2023-08-17 19:51:36 -04:00
Bradley Schofield 6577fc17a9
Remove ./vendor import and add missing envvars 2023-08-17 15:54:19 +01:00
Matej Bačo 01cb386566 Upgrade assistant 2023-08-13 10:28:34 +02:00
Matej Bačo ec82fec59f Re-enable assistant 2023-08-12 21:08:44 +02:00
Matej Bačo c6684ee7f8 PR review changes 2023-08-11 16:45:36 +02:00
prateek banga 6ef7416fff fixes debugger usage 2023-08-11 15:47:33 +05:30
Matej Bačo 5032fd7d08 Fix AI endpoints 2023-08-11 09:52:08 +02:00
Matej Bačo 899bc38069 Merge branch 'cl-1.4.x' into feat-git-integration 2023-08-10 01:12:09 +02:00
Bradley Schofield d001f14249
Add Service Account Role Assignment 2023-08-09 23:46:23 +01:00
Christy Jacob 7d60e4272d Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into feat-implement-migrations 2023-08-09 13:59:44 +00:00
Matej Bačo 2797c5bd22 Update docker-compose.yml 2023-08-09 15:06:21 +02:00
Matej Bačo 93735ac4a7 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 2023-08-09 12:30:45 +02:00
Matej Bačo a60b54f434 Use identities table 2023-08-09 11:52:34 +02:00
Christy Jacob c009a12a25 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x 2023-08-08 20:51:31 +00:00
Bradley Schofield 31ac9b8367 Update docker-compose.yml 2023-08-08 11:18:29 +01:00
Matej Bačo 11068696c9 QA changes 2023-08-07 17:37:36 +02:00
Bradley Schofield 91c82f0d7d Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-07 16:09:28 +01:00
Damodar Lohani 72ebccfd7f update assistant 2023-08-07 07:55:24 +00:00
Matej Bačo 345df3f2ca More QA fixes 2023-08-06 12:30:38 +02:00
Matej Bačo 906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Matej Bačo 8a9f3f1b54 Update build to use 1 logs attribute 2023-08-05 16:50:28 +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
Bradley Schofield 8f5d79e668 Move to new branch 2023-08-04 17:21:41 +01:00
Damodar Lohani 64321cfb0b remove authorization 2023-08-04 13:08:59 +00:00
Damodar Lohani 45afea9175 moved assistant endpoint to console, and add env support 2023-08-04 01:42:22 +00:00