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
Jake Barnby
b6cfe43681
Clean up
2023-03-24 16:46:02 +13:00
fogelito
eee29940bb
Some tests
2023-03-19 19:09:17 +02:00
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
Aayush Bisen
4975a769e7
add restart policy in root compose file
...
Fixes #4986
2023-01-14 09:39:29 +00:00
Matej Bačo
614d7d878f
Add missing ENV var to docker compose
2022-12-26 11:14:35 +01:00
Jake Barnby
4868b8f8ec
Update explorer image
2022-12-13 01:47:07 +13:00
Jake Barnby
f9d2976c1d
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
...
# Conflicts:
# CHANGES.md
# 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/init.php
# app/tasks/sdks.php
# composer.lock
# docker-compose.yml
2022-11-16 19:37:35 +13: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
Damodar Lohani
1e5c94c2c6
Merge branch 'master' into feat-usage-refactor
2022-10-28 13:17:52 +05:45
Jake Barnby
323c0c5ab7
Revert debug changes
2022-10-28 10:25:59 +13:00
Jake Barnby
2469a42d1d
Merge remote-tracking branch 'origin/master' into feat-graphql-support
2022-10-27 12:25:37 +13:00
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
Jake Barnby
c8b19bd84d
Update lock
2022-10-26 16:21:24 +13: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
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
Steven Nguyen
0fdfdcf09c
Re-use same image for all appwrite containers during dev and CI
2022-10-12 11:34:30 -07:00
Jake Barnby
575b882b30
Merge remote-tracking branch 'origin/master' into feat-graphql-support
...
# Conflicts:
# .github/workflows/tests.yml
# composer.lock
2022-10-10 18:41:40 +13:00
Christy Jacob
643b2f1bb4
fix: docker compose synatx
2022-10-06 18:48:50 +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
Jake Barnby
6ac4d4f490
Handle response model union type rules
2022-09-30 19:59:20 +13: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
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
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
