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
a187aa4bc5
bug fixes
2023-04-23 19:57:12 +03:00
578c8d9277
tests
2023-04-17 10:09:48 +03:00
d6e1d0f6f6
updates
2023-04-16 11:43:35 +03:00
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
db4506b0fe
updates
2023-04-10 16:41:23 +03:00
9f6589d21b
Merge branch 'master' of github.com:appwrite/appwrite into __stream
...
Conflicts:
docker-compose.yml
2023-04-04 17:10:31 +03:00
c09f600e73
transcoding -> videos
2023-04-04 17:08:45 +03:00
bccd1a96c0
timeline
2023-04-02 13:48:59 +03:00
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
b6cfe43681
Clean up
2023-03-24 16:46:02 +13:00
eee29940bb
Some tests
2023-03-19 19:09:17 +02:00
00c1418246
Update response Model.php
2023-03-16 13:48:27 +02:00
28af0669f6
docker-compose.yml temp mount
2023-03-16 11:11:04 +02:00
44de884ee5
convert relatedOptions to options
2023-03-16 09:31:48 +02:00
d1c0e0d9a2
realtime events
2023-02-19 16:36:11 +02:00
3d1228ba13
sync with master
...
and renaming attr
2023-02-12 10:56:11 +02:00
edaa93936f
Merge branch 'master' of github.com:appwrite/appwrite into __stream
...
Conflicts:
composer.json
composer.lock
2023-02-09 19:28:26 +02:00
4975a769e7
add restart policy in root compose file
...
Fixes #4986
2023-01-14 09:39:29 +00:00
7c81a1ea88
compose.lock
2023-01-12 15:50:03 +02:00
1af48bd895
Merge branch 'master' of github.com:appwrite/appwrite into __stream
...
Conflicts:
.gitmodules
app/config/errors.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
composer.json
composer.lock
docker-compose.yml
src/Appwrite/Extend/Exception.php
2023-01-11 16:31:26 +02:00
614d7d878f
Add missing ENV var to docker compose
2022-12-26 11:14:35 +01:00
4868b8f8ec
Update explorer image
2022-12-13 01:47:07 +13:00
7daa198f99
updates
2022-11-27 20:03:30 +02:00
5546de13e3
aligning with master
2022-11-21 19:03:56 +02:00
0172a6c393
bla
2022-11-21 11:07:36 +02:00
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
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
60f2d10a50
update variable namings
2022-10-28 09:54:56 +00:00
4c5273b8b2
document the environment variable usage stats retention
2022-10-28 09:16:36 +00:00
1e5c94c2c6
Merge branch 'master' into feat-usage-refactor
2022-10-28 13:17:52 +05:45
323c0c5ab7
Revert debug changes
2022-10-28 10:25:59 +13:00
2469a42d1d
Merge remote-tracking branch 'origin/master' into feat-graphql-support
2022-10-27 12:25:37 +13:00
73bce1d7d0
Merge pull request #4309 from appwrite/fix-update-docker-compose
...
fix: docker compose syntax
2022-10-26 09:48:06 +05:30
c8b19bd84d
Update lock
2022-10-26 16:21:24 +13:00
8048d24857
deprecate database aggregation
2022-10-23 05:17:50 +00:00
d1b3ca5178
comment database worker
2022-10-21 01:29:13 +00:00
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
0fdfdcf09c
Re-use same image for all appwrite containers during dev and CI
2022-10-12 11:34:30 -07:00
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
643b2f1bb4
fix: docker compose synatx
2022-10-06 18:48:50 +05:30
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
6ac4d4f490
Handle response model union type rules
2022-09-30 19:59:20 +13:00
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
ca318c1842
Fixed typo in docker-compose.yml
...
Fixed typo in docker-compose.yml
2022-09-17 20:35:33 +05:00
5fd0de842f
ci: fix build args
2022-09-14 17:52:52 +02:00
c9b0c6f906
sync with 0.16
2022-09-08 15:01:33 +03:00
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
ca0017ca40
streamId
2022-09-05 17:29:03 +03:00
33e608e625
Multi audio tracks
2022-08-30 12:12:03 +03:00
shimon
Jake Barnby
Steven Nguyen
fogelito
Aayush Bisen
Matej Bačo
Damodar Lohani
Damodar Lohani
Christy Jacob
Torsten Dittmann
Toir Tuychiev