1
0
Fork 0
mirror of synced 2024-07-04 14:10:33 +12:00
Commit graph

531 commits

Author SHA1 Message Date
Jake Barnby 163cbc5052
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	composer.json
#	composer.lock
2022-11-17 21:41:56 +13:00
Torsten Dittmann 9f384e016f Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-09 15:47:23 +01:00
Torsten Dittmann a2570f5568 chore: update composer 2022-11-09 15:34:26 +01:00
Jake Barnby a47bfe71bf
Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support
# Conflicts:
#	CHANGES.md
#	composer.json
#	composer.lock
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-04 21:32:57 +13:00
Christy Jacob b2d884e329 Merge branch 'master' of github.com:appwrite/appwrite into 1.1.x 2022-11-01 22:21:19 +05:30
Jake Barnby 8a4fd3307d
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	composer.json
#	composer.lock
2022-11-01 11:38:23 +13:00
fogelito 1e92bda18b composer changes 2022-10-31 16:50:54 +02:00
fogelito eaf59693b7 composer.json 2022-10-31 15:26:40 +02:00
Torsten Dittmann 0049a76565 feat: submodule 2022-10-31 09:53:36 +01:00
Torsten Dittmann d387f198db Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x 2022-10-31 09:45:51 +01:00
fogelito 08e44f0656 some changes 2022-10-26 22:14:39 +03:00
Jake Barnby 2eed73395a
Add GraphQL platform 2022-10-20 16:21:16 +13:00
Jake Barnby f54aa1f4c2
Update framework + swoole 2022-10-20 12:10:41 +13: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
Jake Barnby cecc6dada2
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
# 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/init.php
#	composer.json
#	composer.lock
2022-10-17 12:04:13 +13:00
Damodar Lohani f27ccf4212 upgrade database version 2022-10-14 11:40:59 +00:00
Torsten Dittmann 788abad42e chore: upgrade utopia-php/framework 2022-10-14 12:44:52 +02:00
Jake Barnby 64ad2211c7
Update specs + sdk generator 2022-10-13 17:42:53 +13:00
Jake Barnby 597885028a
Use request setters 2022-10-12 20:55:04 +13: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
Jake Barnby 5c6caf5603
Update to messaging lib to tagged release
(cherry picked from commit 580eafffd2a90fb9dccc4554ac9ce388864f1e8d)

# Conflicts:
#	composer.lock
2022-10-03 13:29:24 +13:00
Jake Barnby 2bb8854f61
WIP integrate messaging library
(cherry picked from commit 9a25f77e3e7e76f6c93cc3ce1985f43426a0debf)

# Conflicts:
#	app/workers/messaging.php
#	src/Appwrite/SMS/Adapter/Mock.php
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-10-03 13:28:30 +13:00
Jake Barnby 8cd36b2721
Fix custom entity list 2022-09-22 22:48:22 +12:00
Jake Barnby 7c3732e277
Update SDK generator version 2022-09-22 21:23:51 +12:00
Christy Jacob a0910a7f58 chore: update sdk generator 2022-09-22 08:39:20 +05:30
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
Christy Jacob 0b767c15a6 feat: update examples 2022-09-14 14:41:08 +05:30
Christy Jacob 2634c5ae19 feat: update specs and platforms 2022-09-06 21:21:07 +04:00
Jake Barnby 95c5d7eb39
Update db + abuse + audit 2022-09-06 21:11:31 +12:00
Jake Barnby 02f54eca65
Fix tests 2022-09-06 13:02:32 +12:00
Jake Barnby 27af4e3b7c
Merge remote-tracking branch 'origin/0.16.x' into fix-write-permission-not-allowed
# Conflicts:
#	composer.lock
2022-09-06 12:28:57 +12:00
Christy Jacob cc124bf211 feat: update for 1.0.0-RC1 2022-09-05 20:11:55 +04:00
Jake Barnby a861b174a2
Add allowed permissions tests 2022-09-05 14:16:40 +12:00
Christy Jacob 06603e53ca feat: udpate sdk version 2022-09-04 21:43:15 +04:00
Christy Jacob 73bae25a3f update sdk versions 2022-09-01 11:16:17 +00:00
Damodar Lohani 0129209eb0 storage version update 2022-08-31 09:37:58 +00:00
Damodar Lohani 63f95c0a5c Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 02:55:26 +00:00
Damodar Lohani 5fa7d34757 zstd compression support on endpoints 2022-08-30 13:46:55 +00:00
Christy Jacob 25d9c8e501 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-27 20:03:15 +00:00
Jake Barnby cab456aaff Update database, audit, abuse 2022-08-27 22:09:49 +12:00
Jake Barnby e989735e89 Remove permissions processor 2022-08-23 13:42:25 +12:00
Jake Barnby 8841f8fe76 Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-22 21:13:29 +12:00
Christy Jacob 2a750eaa73 Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:32:22 +00:00
Christy Jacob 278afd77c0 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:20:08 +00:00
Jake Barnby cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +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
fogelito 093a8be8a3 composer updates 2022-08-17 18:20:26 +03:00
fogelito ae5163c813 tags changes 2022-08-17 17:38:40 +03:00
shimon a4c0d89d55 sync with 0.16 2022-08-17 11:19:31 +03:00
Christy Jacob d2305a7900 feat: update abuse library 2022-08-16 20:45:55 +00:00