Commit Graph

4011 Commits

Author SHA1 Message Date
Prateek Banga 1957bc57c2 makes messaging worker compatible with new messaging lib version 2023-12-19 18:28:25 +05:30
Jake Barnby 23b39fee02 FIx FCM tests 2023-12-17 12:41:20 +13:00
Jake Barnby 121521d7c5 Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/Hamster.php
2023-12-15 18:22:08 +13:00
Jake Barnby 2eace5a627 Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic
# Conflicts:
#	app/controllers/api/messaging.php
#	composer.lock
2023-12-15 02:47:59 +13:00
Jake Barnby 5135262b79 Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
2023-12-15 02:41:46 +13:00
loks0n 1349093b13 chore: fmt 2023-12-13 11:42:45 +00:00
loks0n 92ccdd5144 fix: account tests 2023-12-13 11:29:30 +00:00
loks0n bdcb4c785e test: account already logged in 2023-12-13 11:01:08 +00:00
loks0n d623d4dcf9 Revert "test: fix gql tests"
This reverts commit 467f4eaa06.
2023-12-13 10:26:57 +00:00
Torsten Dittmann 063db1e2bf feat: add execution aggregation to project usage 2023-12-12 18:48:21 +01:00
loks0n 467f4eaa06 test: fix gql tests 2023-12-12 11:50:30 +00:00
loks0n 453c1928ee fix: teams tests 2023-12-11 20:56:59 +00:00
loks0n fe695314a9 fix: tests 2023-12-11 19:41:58 +00:00
loks0n 7ee4ad5ba9 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-12-11 16:52:14 +00:00
Torsten Dittmann ba75f69969 feat: usage breakdown by project 2023-12-11 16:19:08 +01:00
fogelito 310baef77f $queries to String 2023-12-10 20:05:33 +01:00
Torsten Dittmann 95425832ae fix: tests and response models 2023-12-10 11:03:01 +01:00
Christy Jacob c21a063642 fix: failing tests 2023-12-09 01:02:13 +01:00
Christy Jacob 28d00668bd fix: failing tests 2023-12-09 00:48:34 +01:00
Christy Jacob aeeb7e1d55 fix: failing tests 2023-12-09 00:36:01 +01:00
Christy Jacob 75e1779921 fix: failing tests 2023-12-09 00:29:14 +01:00
Christy Jacob 72a2a043cd fix: linter 2023-12-09 00:28:10 +01:00
Christy Jacob aa7d1a87f4 fix: failing tests 2023-12-09 00:27:35 +01:00
Christy Jacob 731e7b86a7 fix: failing tests 2023-12-09 00:17:13 +01:00
Christy Jacob 8b5783d3ff fix: update setParam 2023-12-08 21:02:07 +01:00
Christy Jacob ea3b9ca0ec Revert "Update appwrite base image" 2023-12-07 17:37:15 +01:00
Prateek Banga b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
fogelito 630debdb84 Test 2023-12-06 19:07:29 +01:00
fogelito cc81553cc5 orQueriesTest 2023-12-06 18:19:11 +01:00
Prateek Banga 194bbbb350 review changes 2023-12-05 19:24:55 +01:00
德华 刘 fa7f9be6f7 fix: update image sizes in graphQL test 2023-12-05 14:25:19 +00:00
德华 刘 1595d41490 fix: update qr code test images due to Imagemagic extension upgrade in the base image 2023-12-05 14:13:24 +00:00
loks0n 4471b93a3a tests: fix 2023-12-05 12:00:26 +01:00
loks0n 8ea9706174 feat: Matej renaming plan 2023-11-30 11:35:52 +00:00
prateek banga fa8dc133b4 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-message-provider-type 2023-11-29 15:01:47 +05:30
Jake Barnby 4b58d08fd8 Add providerType to Message 2023-11-29 17:09:44 +13:00
prateek banga ee4c2d0e0d adds target when creating user via server endpoint 2023-11-28 18:42:34 +05:30
Jake Barnby c1f10b06a3 Fix index limit test 2023-11-28 01:34:29 +13:00
Jake Barnby 2c71de1d1b Merge remote-tracking branch 'origin/1.4.x' into feat-isolation-modes
# Conflicts:
#	composer.lock
2023-11-28 00:57:17 +13:00
Jake Barnby 82dfe5ddee Add tests 2023-11-28 00:30:02 +13:00
shimon c9a4eb0a49 tests fix 2023-11-26 22:57:57 +02:00
shimon 21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
prateek banga e3f60f4c78 fix tests 2023-11-23 23:14:02 +05:30
prateek banga 858175fe00 adds target object in subscriber model 2023-11-23 14:35:16 +05:30
Prateek Banga d9826cdce8 makes provider creation fields optional and adds target info in subscriber model 2023-11-23 00:39:55 +05:30
loks0n 88aa4d726c Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-21 14:54:57 +00:00
prateek banga 9c6cd8512f review changes 2023-11-21 15:19:19 +05:30
prateek banga 88f228c106 review changes 2023-11-21 15:11:09 +05:30
prateek banga 520d19e335 changes TextMagic to Textmagic in all places and uses email validator 2023-11-21 12:35:36 +05:30
Jake Barnby 0b01f7140f Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
#	src/Appwrite/Extend/Exception.php
2023-11-21 00:19:17 +13:00