1
0
Fork 0
mirror of synced 2024-06-30 12:10:51 +12:00
Commit graph

488 commits

Author SHA1 Message Date
Damodar Lohani 982a449143 Merge remote-tracking branch 'origin/feat-db-pools' into feat-usage-refactor-fo-db-pools 2022-10-31 06:49:37 +00: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
Christy Jacob 269266127d feat: update db library 2022-10-28 14:30:31 +05:30
Damodar Lohani 1e5c94c2c6
Merge branch 'master' into feat-usage-refactor 2022-10-28 13:17:52 +05:45
Christy Jacob 73bce1d7d0
Merge pull request #4309 from appwrite/fix-update-docker-compose
fix: docker compose syntax
2022-10-26 09:48:06 +05:30
Christy Jacob 2d6a00e56f Merge branch 'feat-mysql-test' of github.com:appwrite/appwrite into feat-db-pools 2022-10-25 19:26:23 +05:30
Christy Jacob 503bd53a47 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-mysql-test 2022-10-25 13:48:59 +00:00
Damodar Lohani 8048d24857 deprecate database aggregation 2022-10-23 05:17:50 +00:00
Damodar Lohani d1b3ca5178 comment database worker 2022-10-21 01:29:13 +00:00
fogelito 1b776f7fdc some changes 2022-10-20 23:59:00 +03:00
Eldad Fux a1157fb49b Env vars clean ups 2022-10-19 15:59:13 +03:00
Eldad Fux 7484656be3 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools-eldad 2022-10-15 22:08:16 +03:00
Eldad Fux 95a9ded28f Adjusted compose files and tests 2022-10-15 21:17:03 +03:00
Eldad Fux 0e9c6db759 Added new connections 2022-10-15 16:49:37 +03:00
Steven Nguyen 0fdfdcf09c
Re-use same image for all appwrite containers during dev and CI 2022-10-12 11:34:30 -07:00
Christy Jacob 643b2f1bb4 fix: docker compose synatx 2022-10-06 18:48:50 +05:30
Christy Jacob 1a9c4e3756 fix: mysql indexes issue 2022-10-06 18:41:15 +05:30
Torsten Dittmann 4bb44ad315
Merge pull request #3757 from appwrite/feat-github-non-self-hosted
ci: update github actions to use github hosted runners
2022-10-04 12:06:42 +02:00
Christy Jacob a847064093 fix: failing tests 2022-09-28 00:59:51 +05:30
Christy Jacob 3b802e9ba6 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-09-27 20:59:50 +05:30
Toir Tuychiev ca318c1842
Fixed typo in docker-compose.yml
Fixed typo in docker-compose.yml
2022-09-17 20:35:33 +05:00
Torsten Dittmann 5fd0de842f ci: fix build args 2022-09-14 17:52:52 +02:00
Jake Barnby 625608804e Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# 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/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:21:15 +12:00
Christy Jacob c3205b8266 feat: update environment vars 2022-08-24 21:45:39 +05:30
Jake Barnby 7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
# 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/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Damodar Lohani 3e43424129 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-18 00:49:31 +00:00
shimon 73095a325e addressing comments 2022-08-17 16:02:01 +03:00
shimon bb4390e089 addressing comments 2022-08-17 14:18:22 +03:00
shimon 4729444622 fix 2022-08-17 12:52:50 +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
shimon 9c68cff317 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	composer.json
	composer.lock
2022-08-17 11:16:09 +03:00
Damodar Lohani 80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
Christy Jacob 4b0c707fd3 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-16 20:37:05 +00:00
Jake Barnby fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/storage.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
2022-08-16 19:20:26 +12:00
Eldad Fux 95181546b4 Adpated tests 2022-08-14 21:09:24 +03:00
Eldad Fux 22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03:00
Eldad Fux 25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
shimon 36fd693728 some fixes 2022-08-14 14:48:51 +03:00
shimon 91345e3f9b some fixes 2022-08-14 10:45:42 +03:00
shimon 02f57cd69d Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	composer.lock
2022-08-13 18:45:29 +03:00
shimon af56db4048 some fixes 2022-08-13 18:36:44 +03:00
Torsten Dittmann d9c7bbd3d2 fix: scripts for filters and charts 2022-08-09 16:05:34 +02:00
Damodar Lohani ebac3f5547 usage containers updated 2022-08-09 05:52:53 +00:00
Damodar Lohani c2b016cb5f update usage interval environment variables 2022-08-09 05:29:24 +00:00
fogelito ba40ac4e90 Change models Class name 2022-07-28 13:26:22 +03:00
Christy Jacob da16c0159b feat: rename environment variable 2022-07-27 09:17:00 +05:30
Torsten Dittmann 3f51595d25 feat: upgrade mariadb and redis 2022-07-25 15:54:15 +02:00
Christy Jacob 2baeac04d1 feat: comment redis-commander 2022-07-16 11:04:59 +05:30
Christy Jacob 42f0bddd60 feat: merge and fix conflicts 2022-07-15 13:54:27 +04:00