1
0
Fork 0
mirror of synced 2024-07-06 23:21:05 +12:00
Commit graph

380 commits

Author SHA1 Message Date
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
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 1db0c57518 PR review changes 2023-08-04 07:59:23 +02:00
Matej Bačo c8010ecae8 Fix CURL 2023-08-01 09:45:37 +02:00
Matej Bačo ac2ca267d7 Address more PR reviews 2023-07-31 08:47:47 +02:00
loks0n 80aa2374d1 chore: add var to docker 2023-07-21 11:23:08 +01: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 f5e9094bdc delete unnecessary project collections task 2023-06-15 09:51:11 +03:00
shimon e225bbe3c9 delete unnecessary project collections task 2023-06-14 17:42:23 +03:00
Matej Bačo 2c97d73f4b WIP Stream logs 2023-06-13 13:13:02 +02:00
Matej Bačo 039bfbaf06 WIP: Log streaming 2023-06-13 08:26:36 +02:00
shimon 3b6128c560 calc tier stats 2023-05-30 18:17:47 +03:00
shimon 1225c8b7c3 calc tier stats 2023-05-30 18:06:51 +03:00
shimon 99b56b3584 downgraded csv writer ver 2023-05-24 12:17:14 +03:00
shimon e79cb913ed calculating users per project task 2023-05-23 18:58:49 +03:00
Matej Bačo c09c8b4d25 Fix wildcard issue with OPTIONS & CORS 2023-05-22 21:27:14 +02: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 ecbc9aecb3 Migrated cache buster to a script 2023-05-02 13:21:08 +02:00
Christy Jacob bf5187d74d feat: update dockerfile to include public directory 2023-04-30 01:29:11 +05:30
Torsten Dittmann 7d119aa68c ci: try sharing console build for all 2023-04-19 14:03:23 +02:00
Jake Barnby 7fe14ca10b
Merge remote-tracking branch 'origin/master' into sync-master
# 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
#	app/console
#	app/controllers/api/storage.php
#	composer.lock
2023-04-12 00:50:31 +12:00
Vincent (Wen Yu) Ge b39b018a10
Update Dockerfile
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-04-09 16:46:05 -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
Steven Nguyen a86c1c0a2b
Fix yasd so that the debugger works
* Update the base image since the yasd extension wasn't installed correctly
* Fix the path to the yasd_init.php file
* Use `host.docker.internal` as the remote host because that should always work inside docker
* Mount the dev folder into the appwrite container so the yasd_init.php file is picked up.
2023-03-29 18:04:24 -07:00
Christy Jacob 7871e9aa4c
Update Dockerfile 2023-03-24 19:03:25 +05:30
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
Steven Nguyen fcf3283365
Bump base docker image to fix missing rsync 2023-03-23 13:32:03 -07:00
Matej Bačo bd620cc924 Remove old patch bin file 2023-03-22 20:39:56 +01:00
Matej Bačo b558a284f3 Add bin files 2023-03-22 20:15:01 +01:00
Damodar Lohani d26d0d5943 update base docker image 2023-03-16 07:50:04 +00:00
Matej Bačo d10c7c7775 Merge branch 'feat-db-pools-master' into feat-executor-v3-sync 2023-03-15 08:59:42 +01:00
Matej Bačo c01fcb130c Merge branch 'feat-db-pools-master' into feat-db-pools-sync 2023-03-14 12:58:54 +01:00
Matej Baco 04c7db9f7b Bug fixes for proxy rule service 2023-03-10 07:42:52 +00:00
Christy Jacob 46f07faa98 feat: update Docekrfile to use appwrite:base image 2023-03-09 12:07:47 +00:00
Damodar Lohani 5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +00:00
Damodar Lohani 171f30adb1 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-16 00:29:37 +00:00
Eldad A. Fux 89560c4b82
Merge pull request #5106 from appwrite/feat-use-new-base-image
build using appwrite base docker image
2023-02-15 10:52:55 +02:00
Damodar Lohani 71d2c45a92 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-14 04:35:19 +00:00
Bradley Schofield 4715bbcf57 Update Dockerfile 2023-02-13 23:29:35 +00:00
Bradley Schofield 1e9bbdbda0 Add Default growth server 2023-02-13 14:52:58 +00:00
Bradley Schofield 5a665f3ad1 Update Dockerfile 2023-02-13 14:18:04 +00:00
Damodar Lohani 6026358fb2 build using appwrite base docker image 2023-02-13 03:37:34 +00:00
Matej Bačo eea635fe4b Basic implementation for Open Runtimes V2 2023-02-09 15:27:11 +01:00
shimon e278732481 removed some unnecessary files 2023-01-31 16:50:52 +02:00
Christy Jacob e654ec2720
Merge pull request #4889 from appwrite/feat-aggregate-stats
feat: aggregate stats
2023-01-26 16:31:34 +05:30
Christy Jacob c97e7ce328 feat: update scripts 2023-01-26 02:26:33 +05:30
Bradley Schofield 45b68fa44f Update Dockerfile 2023-01-19 16:08:05 +00:00
shimon c6b3fb39b1 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats
 Conflicts:
	app/console
	app/workers/builds.php
	docker-compose.yml
	src/Appwrite/Usage/Stats.php
2022-12-21 09:58:22 +02:00