Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,153 Commits 1,269 Branches 495 Tags
__stream_back_2
Commit Graph

337 Commits

Author SHA1 Message Date
shimon f3508e1701 Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.gitmodules
	Dockerfile
	app/config/services.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/console
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/teams.php
	composer.json
	composer.lock
	src/Appwrite/Utopia/Response.php
 2023-05-07 11:43:29 +03:00
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
shimon 9f6589d21b Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	docker-compose.yml
 2023-04-04 17:10:31 +03:00
shimon c09f600e73 transcoding -> videos 2023-04-04 17:08:45 +03:00
shimon 2b60b18a3c timeline 2023-04-04 14:24:18 +03: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
shimon 4a8ef126bd Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	app/config/errors.php
	composer.json
	composer.lock
 2023-03-23 18:06:11 +02:00
Damodar Lohani d26d0d5943 update base docker image 2023-03-16 07:50:04 +00:00
shimon cfb53be8ac metadata extraction ffmpeg -> mediainfo 2023-03-02 10:56:04 +02:00
shimon a1918d1512 video tests 2023-02-21 11:21:47 +02:00
shimon d26aabb083 realtime events 2023-02-20 10:14:20 +02:00
shimon d1c0e0d9a2 realtime events 2023-02-19 16:36:11 +02:00
shimon 4ac062edfe Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.gitmodules
	Dockerfile
	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
	composer.lock
 2023-02-19 10:51:50 +02: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
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
shimon 7ea695937b Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.gitmodules
	app/console
 2022-11-27 20:05:28 +02:00
Christy Jacob 4813e6b4d5 feat: add console mode 2022-11-22 19:32:35 +00:00
Christy Jacob fc752039a4 Update Dockerfile 
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
 2022-11-23 00:29:26 +05:30
Christy Jacob d2b0218aba feat: add build args for console 2022-11-22 18:26:41 +00:00
shimon 19a38cd06a Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 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/workers/deletes.php
	composer.json
	composer.lock
	docker-compose.yml
 2022-11-20 13:37:03 +02:00
Torsten Dittmann 85ed70f346 fix: remove Dockerfile leftovers 2022-11-15 14:02:14 +01:00
Torsten Dittmann 9412013360 feat: remove stuff 2022-11-14 21:58:51 +01:00
Torsten Dittmann 310ff90d22 Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-14 15:57:40 +01:00
Torsten Dittmann 465dad522e fix: remove unnecessary files 2022-11-14 15:31:24 +01:00
Torsten Dittmann d307d4f698 revert: dockerfile formatting 2022-11-09 15:45:20 +01:00
Torsten Dittmann ab5ddc263b Merge branch 'feat-console-rewrite' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-09 15:06:32 +01:00
Torsten Dittmann d8717a4a16 fix: console build 2022-10-31 11:50:19 +01:00
Damodar Lohani 60f2d10a50 update variable namings 2022-10-28 09:54:56 +00:00
Damodar Lohani 4c5273b8b2 document the environment variable usage stats retention 2022-10-28 09:16:36 +00:00
Torsten Dittmann 7f256e5d06 feat: add console repo 2022-10-26 21:23:02 +02:00
Damodar Lohani 8048d24857 deprecate database aggregation 2022-10-23 05:17:50 +00:00
Torsten Dittmann 4210fdcb27 feat: console rewrite 2022-10-11 16:36:39 +02:00
shimon 1aed3a1db5 Merge branch '0.16.x' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.env
	app/config/collections.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/account.php
	app/controllers/api/storage.php
	app/init.php
	composer.json
	composer.lock
	docker-compose.yml
	phpunit.xml
	src/Appwrite/Extend/Exception.php
	src/Appwrite/Utopia/Response.php
 2022-09-06 11:14:11 +03:00
Damodar Lohani 5900387237 fix zstd build 2022-08-31 13:21:52 +00:00
Damodar Lohani 4bc022736c fix zstd extension to commit hash 2022-08-31 09:45:47 +00:00
Damodar Lohani d2ec87de2c Update Dockerfile 
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
 2022-08-31 09:11:21 +05:45
Damodar Lohani e54125a6f5 zstd extension in dockerfile 2022-08-31 02:09:08 +00:00
shimon ebe794926c addressing comments 2022-08-23 17:17:40 +03:00
Damodar Lohani a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00:00
Eldad Fux 25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
Damodar Lohani c2b016cb5f update usage interval environment variables 2022-08-09 05:29:24 +00:00
Matej Bačo b40826f4ee Leftovers 2022-07-27 10:54:49 +00:00
Matej Bačo 8d253ed5ff Switch from Bradley repo to official Appwrite (scrypt) 2022-07-25 15:51:18 +00:00
Matej Bačo dbccf39a9f Merge branch 'master' into feat-password-hash-algos 2022-07-25 12:37:07 +00:00
shimon 5e903daf6f small fix 2022-07-05 13:51:28 +03:00
shimon e48e1dae2c small fix 2022-07-05 11:55:49 +03:00