Commit Graph

194 Commits

Author SHA1 Message Date
fogelito 9c8c017618 Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
 Conflicts:
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/users.php
	composer.json
	composer.lock
2024-01-29 08:50:53 +02:00
Bradley Schofield 77caf64076 Add XDebug to Appwrite 2023-11-06 10:08:11 +00:00
shimon 9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
Torsten Dittmann 342deb4989 Merge pull request #6465 from appwrite/fix-docs-links
Fix docs links CONTRIBUTING.md
2023-10-23 19:24:43 +02:00
Christy Jacob be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
Steven Nguyen 9fbf10f9f5 Merge branch 'main' into fix-docs-links 2023-10-17 13:08:03 -07:00
Vincent (Wen Yu) Ge 9b0a2fdc73 Fix docs links CONTRIBUTING.md 2023-10-03 15:10:09 -04:00
Vincent (Wen Yu) Ge 4a43c84b29 Update CONTRIBUTING.md
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2023-10-03 15:02:17 -04:00
Vincent (Wen Yu) Ge 897e975b49 Update with hacktoberfest instructions. 2023-10-03 10:36:27 -04:00
Jake Barnby c54bb902a2 Merge pull request #6058 from appwrite/feat-sync-1.4
master -> 1.4.x
2023-08-29 14:59:16 -04:00
Jake Barnby cc924b0984 Merge remote-tracking branch 'origin/master' into feat-sync-1.4
# Conflicts:
#	app/controllers/api/storage.php
#	app/workers/deletes.php
2023-08-29 14:48:18 -04:00
Eldad A. Fux 9463607067 Merge pull request #5327 from pranjalg13/doc-5318-update-documentation-on-building-static-files
Added Documentation change on static files
2023-08-24 18:39:15 +03:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Steven Nguyen aa3c2faed9 Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Torsten Dittmann eac59e9d02 Merge pull request #5314 from appwrite/fix-specs-command
Update CONTRIBUTING.md to fix specs command
2023-04-27 18:22:58 +02:00
Pranjal Goyal fbacd412e9 Updated and Resolved Comments 2023-04-21 08:27:24 +05:30
Pranjal Goyal 977d67a4f8 Updated Documentation on Pink and Contribution Gd 2023-04-20 16:49:38 +05:30
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
Pranjal Goyal 726d626543 Added Documentation change on static files 2023-04-08 22:11:23 +05:30
Steven 8129bd9156 Update CONTRIBUTING.md to fix specs command
The CLI expects name=value for arguments rather than just positional.
2023-03-31 11:53:27 -07: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
Steven Nguyen 137c2d663e Prevent cache from being flushed on start
We shouldn't clear the cache because scheduled functions are also
in the cache and we don't want to lose them.
2023-03-14 16:09:14 -07:00
Steven Nguyen 7ab490ab68 Prevent cache from being flushed on start
We shouldn't clear the cache because scheduled functions are also
in the cache, and we don't want to lose them.
2023-03-14 16:07:37 -07: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
Christy Jacob e1dd5295f4 Update CONTRIBUTING.md 2023-01-27 18:36:20 +05:30
Eldad A. Fux 514b42bea2 Merge pull request #4741 from appwrite/fix-update-contribution-guide
Update contributing guide to include submodule update command
2023-01-08 13:37:14 +02:00
Vincent (Wen Yu) Ge ae6736222c Remove eldad's name 2022-12-30 15:02:21 +00:00
Vincent (Wen Yu) Ge 5e090c4cd4 Update CONTRIBUTING.md
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-12-30 09:38:18 -05:00
Vincent (Wen Yu) Ge eccae13651 Contribution guide updated 2022-12-29 22:40:53 +00:00
shimon 0348472345 usage cleanup 2022-12-11 19:15:38 +02:00
Jake Barnby e4f546eae0 Fix contribution merge changes 2022-12-07 19:28:37 +13:00
Steven Nguyen 7b09fa3f17 Update contributing guide to include submodule update command 2022-11-21 08:28:29 -08:00
Jake Barnby 5a84a37a9e Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/init.php
2022-11-18 12:41:48 +13:00
Steven Nguyen 3d01bf6505 Update links to code of conduct 2022-11-16 20:37:24 -08:00
Jake Barnby 323c0c5ab7 Revert debug changes 2022-10-28 10:25:59 +13:00
Jake Barnby a2b1941a47 Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	CONTRIBUTING.md
#	composer.json
#	composer.lock
#	docs/references/teams/list-teams.md
2022-10-19 13:17:56 +13:00
Christy Jacob e9ef5b5eac Merge pull request #4303 from MrKrishnaAgarwal/typos
Fixed Typo's and Rephrased words
2022-10-18 11:34:20 +04:00
Steven Nguyen 0fdfdcf09c Re-use same image for all appwrite containers during dev and CI 2022-10-12 11:34:30 -07:00
Krishna Agarwal de39663095 made changes 2022-10-07 23:16:54 +05:30
Krishna Agarwal 00eeebbf04 Update CONTRIBUTING.md 2022-10-07 23:15:50 +05:30
Krishna Agarwal 1313a30563 Update CONTRIBUTING.md 2022-10-07 23:14:49 +05:30
Krishna Agarwal 11caeaba11 Update CONTRIBUTING.md 2022-10-07 23:13:42 +05:30
Krishna Agarwal 36f59375da Update CONTRIBUTING.md 2022-10-07 23:13:19 +05:30
Krishna Agarwal 5a9525fb89 fixed typo 2022-10-06 09:08:12 +05:30
Krishna Agarwal d851733f6a fixed typos, removed space 2022-10-06 09:01:31 +05:30
Krishna Agarwal 067858ae10 fixed typo 2022-09-21 22:48:51 +05:30
Swati Z 92e3c79812 Update Contributing.md with Typo
Update Contributing.md with Typo
2022-09-20 12:36:16 -04:00
Jake Barnby e9f75d32a1 Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	Dockerfile
#	app/config/errors.php
#	app/config/roles.php
#	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/controllers/api/graphql.php
#	app/controllers/shared/api.php
#	app/init.php
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Migration/Migration.php
2022-09-20 15:43:09 +12:00
Jake Barnby b2e659bd3f Review fixes 2022-08-14 17:21:33 +12:00
Jake Barnby 09b001e891 PR fixes 2022-08-13 02:41:57 +12:00