1
0
Fork 0
mirror of synced 2024-07-05 14:40:42 +12:00
Commit graph

360 commits

Author SHA1 Message Date
shimon 432ee72071 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	app/cli.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/teams.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	src/Appwrite/Event/Event.php
	src/Appwrite/Event/Mail.php
2023-05-22 18:41:24 +03:00
Damodar Lohani 9a358b921a fix formatting 2023-05-15 00:32:37 +00:00
Damodar Lohani d9a1ae2761 paused unit test 2023-05-15 00:30:31 +00:00
Damodar Lohani 5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +00:00
Damodar Lohani 171f30adb1 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-16 00:29:37 +00:00
Damodar Lohani 71d2c45a92 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-14 04:35:19 +00:00
Jake Barnby f6fc9a8d8c
Merge remote-tracking branch 'origin/master' into feat-technical-debt-2
# Conflicts:
#	composer.lock
2023-02-14 14:22:08 +13:00
shimon f20144dbcd addressing comments 2023-02-06 16:40:22 +02:00
shimon 5850a454e0 addressing comments 2023-02-05 22:07:46 +02:00
Torsten Dittmann 24a7caf936 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-4803-flutter-web-platform-type 2023-01-27 13:24:41 +01:00
fogelito c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2
 Conflicts:
	app/init.php
	composer.json
	composer.lock
2023-01-16 10:24:37 +02:00
shimon a0554ca91e usage test 2023-01-15 12:25:03 +02:00
shimon 44af561d06 usage test 2023-01-15 12:03:52 +02:00
Bradley Schofield 7910149053 Remove tests and update other references to old validators 2023-01-13 15:42:29 +00:00
Bradley Schofield 31b718d829 Replace Appwrite Validators with backported Utopia ones
+ Updated Utopia Framework to 0.26.0
+ Replaced Appwrite Validators with Utopia ones
2023-01-13 15:28:04 +00:00
Damodar Lohani f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00
Steven Nguyen be77b10549
Add flutter-web as a platform type
Having a dedicated type for flutter-web will allow us to differentiate
between Flutter Web and Web in the Appwrite Console.
2023-01-11 15:47:49 -08:00
Matej Bačo 39cb846ae0 Fix failing test 2022-12-27 09:09:47 +01:00
Matej Bačo ccc9432219 Merge branch 'master' into fix-1.2.x-conflicts 2022-12-27 08:29:10 +01:00
Bradley Schofield b0c8e8980d Continue removing resque 2022-12-20 12:48:55 +00:00
Bradley Schofield a09e23d0b9 Start work on porting webhooks 2022-12-20 11:07:49 +00:00
Christy Jacob 37ce513b87
Merge pull request #4341 from megatank58/patch-1
fix: correctly handle `=` in .env
2022-12-20 16:32:29 +05:30
shimon 7b9a8c01f2 benchmarks 2022-12-19 10:30:32 +02:00
fogelito 8ade726932 Changing Role + Permissions namespace 2022-12-14 18:04:06 +02:00
fogelito f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
shimon 0348472345 usage cleanup 2022-12-11 19:15:38 +02:00
Christy Jacob 080abbbb79 Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console 2022-11-17 20:26:10 +05:30
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
Bradley Schofield 3c71164741 Merge branch '1.1.x' into feat-implement-session-length-api 2022-11-14 15:30:38 +00:00
Bradley Schofield 94676a6c16 Alter sessionVerify to remove expire 2022-11-04 09:50:59 +00:00
Christy Jacob 9165da14b7 feat: add support for the new DSN class 2022-10-26 12:16:22 +05:30
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
Damodar Lohani b1f3fdce7a fix stats test 2022-10-18 02:26:28 +00:00
megatank58 819ba45836
chore(tests): add test case for value ending in = 2022-10-17 16:02:24 +05:30
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 c635846dba fix missing import 2022-10-16 01:47:38 +00:00
Damodar Lohani 185b206076 fix moved constant 2022-10-14 11:23:20 +00:00
Jake Barnby a1718e8a44
Remove database dependency from mapper 2022-10-14 18:01:39 +13:00
Jake Barnby 4bc44183b6
Restructure type related helpers 2022-10-12 13:57:37 +13:00
Jake Barnby 20bee94175
Fix unit test 2022-10-11 14:20:19 +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
sooraj 49c0c2d996 change test case 2022-10-07 07:39:22 +05:30
Sooraj S 81fc5ee6b3
Merge pull request #1 from appwrite/master
new
2022-10-06 09:01:55 +05:30
sooraj 62f63923c1 new test case 2022-10-05 19:40:05 +05:30
sooraj 91f16121d1 adding a test 2022-09-30 18:10:02 +05:30
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
Steven Nguyen 2f08ec0926 Convert Document $collectionId in 0.15 response
Document $collection was renamed to $collectionId to match the naming
convention of referring to other resource IDs. This ensures backwards
compatibility.
2022-09-20 02:48:40 +00:00
Steven Nguyen 01f77fa993 Ensure empty datetimes are 0 in 0.15 response
Because empty datetimes are invalid, strtotime returned false so the
response was false rather than 0.
2022-09-20 02:48:40 +00:00
Torsten Dittmann d0c3f52ab6 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-migration-1.0.0 2022-09-14 10:20:42 +02:00