1
0
Fork 0
mirror of synced 2024-07-05 22:51:24 +12:00
Commit graph

477 commits

Author SHA1 Message Date
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
Jake Barnby 7784422f84 Fix maintenance worker 2022-08-23 17:23:01 +12:00
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 0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Damodar Lohani 792d657a4f formatting fixes 2022-08-13 05:10:34 +00:00
Damodar Lohani 3d25ef1be5 refactor case 2022-08-13 04:51:52 +00:00
shimon 092e682591 Merge branch 'master' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	app/controllers/shared/api.php
2022-08-09 15:02:29 +03:00
fogelito 82a240998b Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-attributes
 Conflicts:
	composer.lock
	src/Appwrite/Stats/Usage.php
2022-08-09 14:20:26 +03:00
Damodar Lohani 99c1f14581 white space fix 2022-08-09 06:07:05 +00: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
Damodar Lohani e405e35736 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-07-17 08:48:19 +00:00
Christy Jacob 88a77127ea
Merge pull request #2450 from PineappleIOnic/Add-DNS-Warning-Install
Add a DNS warning during install
2022-07-15 13:26:12 +04:00
Torsten Dittmann 5604a6837f Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-07-14 14:14:05 +02:00
fogelito 45ac40cc85 change function names 2022-07-13 17:02:49 +03:00
fogelito f384a3352b change class from database:: to dateTime:: 2022-07-12 16:32:39 +03:00
fogelito 7e08575245 builds, stats 2022-07-11 18:12:41 +03:00
Damodar Lohani 79dc3ab3fa
set proper log namespace 2022-07-07 13:37:29 +05:45
Damodar Lohani 4422613248 update tests with less waiting time 2022-07-06 01:56:47 +00:00
shimon 7b429bdcd7 cache cleanup 2022-07-03 12:36:59 +03:00
Torsten Dittmann e81ea8126a style: fix var type in specs 2022-06-30 10:51:35 +02:00
Torsten Dittmann 3e1a92f486 chore: linter 2022-06-30 01:46:04 +02:00
Torsten Dittmann 056e0d79ed fix: add nested models to specifications 2022-06-30 01:41:49 +02:00
Torsten Dittmann 0c192e5a3e Merge branch '0.15.x' of https://github.com/appwrite/appwrite into feat-migration-0-15-x 2022-06-27 18:53:44 +02:00
Torsten Dittmann 3cdeeac964 feat: global attributes in specs 2022-06-27 10:41:10 +02:00
Torsten Dittmann 604c7e4992 fix: database layer migration 2022-06-22 15:52:21 +02:00
Torsten Dittmann fc36e6c2d0 fix: migration for custom collections and buckets 2022-06-21 19:39:05 +02:00
Torsten Dittmann b069b7c1bb chore: update docs 2022-06-21 10:03:50 +02:00
Torsten Dittmann 59940e81a8 chore: prepare 0.15 2022-06-20 18:23:54 +02:00
Torsten Dittmann 511898afc9 Merge branch '0.15.x' of https://github.com/appwrite/appwrite into origin/feat-internal-id 2022-06-20 15:34:27 +02:00
Torsten Dittmann 50e50fa94b feat: use internal ids for database indexes and attributes 2022-06-20 13:21:36 +02:00
Torsten Dittmann 93ec03cdb9
Merge pull request #3390 from appwrite/update-compose-v2
Update docker-compose to docker compose
2022-06-19 11:45:34 +02:00
Torsten Dittmann e5b0cbd308
Merge pull request #3362 from appwrite/docker-compose-v2
Feat: Start using docker compose V2
2022-06-19 11:42:53 +02:00
Vincent (Wen Yu) Ge ef1133913d reverting change in install.php 2022-06-17 16:02:42 +00:00
Damodar Lohani 2c89d063c1
Merge pull request #3373 from appwrite/feat-usage-refactor 2022-06-17 06:51:59 +05:45
Vincent (Wen Yu) Ge 0328bec61f update docker-compose to docker compose 2022-06-16 17:23:56 +00:00
Damodar Lohani af19787ed9 logging updates 2022-06-14 23:40:56 +00:00
Damodar Lohani 05152da195 fix formatting 2022-06-13 15:49:27 +00:00
Damodar Lohani ae9bed4ab7 Merge branch 'master' into feat-usage-refactor 2022-06-13 16:59:01 +05:45
Damodar Lohani 2a13cc33ac cleaning up refactors 2022-06-13 16:56:26 +05:45
Damodar Lohani da533571b3 usage refactor initial 2022-06-13 16:41:24 +05:45
Bradley Schofield 666f1fbfb1
Merge branch 'appwrite:master' into Add-DNS-Warning-Install 2022-06-09 13:26:41 +01:00
Matej Bačo 3bb4aab296 Start using docker compose V2 2022-06-09 11:38:38 +00:00
Torsten Dittmann 4327ff912f feat: remove expired sessions with maintenance task 2022-06-02 12:20:03 +02:00
Everly Precia Suresh 19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00
Torsten Dittmann 3dcf5704d2 fix: installation overriding default env variables 2022-05-18 15:18:12 +02:00
Torsten Dittmann 8782b382fb fix: resonse format for sdks 2022-05-17 10:49:07 +02:00
Torsten Dittmann 55471fc0c9 fix: install template 2022-05-16 16:07:25 +02:00