Commit Graph
665 Commits
Author SHA1 Message Date
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
prateek banga 6ef7416fff fixes debugger usage 2023-08-11 15:47:33 +05:30
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
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
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
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
Damodar Lohani 2a7ec490af setup appwrite assistant for test 2023-08-03 10:29:36 +00:00
loks0n 611fbf6b32 feat: X domain console cookie 2023-07-21 11:08:34 +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
Torsten Dittmann 92cda20448 chore: revert docker compose changes 2023-06-02 15:21:20 +02:00
Torsten Dittmann 21b41c475d chore: prepre 1.3.6 2023-06-02 15:21:05 +02:00
Christy Jacob 7d19fe87f5 Merge pull request #5577 from appwrite/feat-improve-logs
Feat: Improve logs
2023-05-25 00:52:47 +05:30
Matej Bačo 3614cb384a Fix error logging 2023-05-24 21:07:41 +02:00
shimon ab83dfedac downgraded csv writer ver 2023-05-24 21:38:35 +03:00
shimon adca405d74 downgraded csv writer ver 2023-05-24 14:10:32 +03:00
Matej Bačo a8cd99873f Add cache, fix miss-align 2023-04-26 11:10:06 +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
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 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
Jake Barnby b6cfe43681 Clean up 2023-03-24 16:46:02 +13:00
Christy Jacob 39388e9b92 feat: use env vars for the hamster time 2023-03-20 12:58:11 +05:30
fogelito eee29940bb Some tests 2023-03-19 19:09:17 +02:00
Christy Jacob 42ebaf6541 feat: store token in env var 2023-03-17 21:37:29 +05:30
fogelito 00c1418246 Update response Model.php 2023-03-16 13:48:27 +02:00
fogelito 28af0669f6 docker-compose.yml temp mount 2023-03-16 11:11:04 +02:00
fogelito 44de884ee5 convert relatedOptions to options 2023-03-16 09:31:48 +02:00
Matej Bačo c01fcb130c Merge branch 'feat-db-pools-master' into feat-db-pools-sync 2023-03-14 12:58:54 +01:00
Christy Jacob 5a8cab8de7 feat: update console branch 2023-02-22 17:57:44 +00:00
Christy Jacob ad2c068e75 feat: update console mode 2023-02-22 12:46:54 +05:30
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
Shimon NewmanandChristy Jacob d1153ee0d7 Update docker-compose.yml
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-02-15 21:20:25 +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
Christy Jacob 38d7401aa9 feat: automate hamster 2023-02-06 15:23:33 +05:30
shimon 5850a454e0 addressing comments 2023-02-05 22:07:46 +02:00
shimon 1ac935077b addressing comments 2023-02-02 20:16:01 +02:00
shimon abdd5f016a addressing comments 2023-02-02 13:55:23 +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
Damodar Lohani 4356af621a fix env variables 2023-01-20 10:40:06 +00:00
Christy Jacob 30690f6bc4 Merge pull request #4885 from appwrite/revert-4844-feat-build-size
Revert "Feat: Build output size"
2023-01-19 15:04:35 +05:30
shimon 68f7756601 usage test 2023-01-16 10:55:51 +02:00
shimon a852672bff Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats 2023-01-15 17:18:32 +02:00
Aayush Bisen 4975a769e7 add restart policy in root compose file
Fixes #4986
2023-01-14 09:39:29 +00:00