Commit Graph

32166 Commits

Author SHA1 Message Date
Jake Barnby e65cc78234 Update executor default var to match new container hostname 2024-05-24 15:30:14 +12:00
Jake Barnby 5510a25066 Merge pull request #8148 from appwrite/chore-remove-compose-version
chore: remove compose version
2024-05-24 13:47:40 +12:00
Steven Nguyen 1ac7d3576d Merge branch '1.5.x' into chore-sync-1.5.x 2024-05-24 00:49:02 +00:00
Christy Jacob 4a4d5109e2 Merge branch '1.5.x' into sync-1.5.x-with-cloud 2024-05-23 23:36:13 +04:00
Steven Nguyen ecdcd18dab Merge pull request #8183 from appwrite/fix/7887-invalid-cache-document-id
Fix invalid cache document id
2024-05-23 12:34:53 -07:00
Binyamin Yawitz ebe386acd9 feat(logger): Unifying logger environment variable and adapting to the latest Logger version 2024-05-23 12:44:19 -04:00
fogelito 552c729c5a fix enqueueResources 2024-05-23 18:22:25 +03:00
fogelito 0994b0f2de trigger migration 2024-05-23 18:14:00 +03:00
fogelito ecfc5d68c2 accept null 2024-05-23 17:49:41 +03:00
fogelito 06a5e76c50 ScheduleBase refactor 2024-05-23 17:42:03 +03:00
shimon a2ef77f0f5 lint 2024-05-23 16:47:37 +03:00
shimon c996dbcdc9 lint 2024-05-23 16:39:23 +03:00
shimon a22d98296c lint 2024-05-23 16:33:40 +03:00
Khushboo Verma f0de4c6eac Resolved merge conflict 2024-05-23 18:34:48 +05:30
navjotNSK fcbab74f04 All translations added. 2024-05-23 15:55:57 +05:30
ItzNotABug 81e8502a78 fix: dont override humans.txt too. 2024-05-23 15:54:12 +05:30
navjotNSK 2621d948c6 All translations added. 2024-05-23 15:53:59 +05:30
ItzNotABug 5462b83d3c fix: don't override robots.txt for other domains. 2024-05-23 14:47:59 +05:30
shimon 2414438ded Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into chore-error-requests-count
 Conflicts:
	app/controllers/shared/api.php
	composer.json
2024-05-23 11:01:28 +03:00
shimon 87cf7776df lint 2024-05-23 10:59:19 +03:00
Jake Barnby 9bb9f1eee7 Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets
# Conflicts:
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-05-23 15:37:13 +12:00
Steven Nguyen 9db92698dc fix(cache): use the same cache key when loading and saving files 2024-05-22 23:23:16 +00:00
Christy Jacob 87ee2770a8 Merge pull request #8184 from appwrite/sync-with-1.5.x
Sync refactor-usage-sn with 1.5.x
cl-1.5.5-24
2024-05-23 01:25:56 +04:00
Torsten Dittmann a9c701cdc1 tests: fix new status codes 2024-05-22 23:19:21 +02:00
Christy Jacob 54093617ee chore: linter 2024-05-22 19:57:57 +00:00
Christy Jacob aa76862692 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x 2024-05-22 19:43:31 +00:00
Steven Nguyen 8d5583f0c6 fix(cache): fix invalid cache document id
The document ID should not have special characters like "*" or it will
cause problems with things like cursor based pagination which is done
in migrations.

We did have the cache buster inside the md5 call before, but when the
usage code was reverted and whatnot, the change wasn't added back
properly.

Related: https://github.com/appwrite/appwrite/issues/7887
2024-05-22 19:16:34 +00:00
shimon 892caf4710 update composer cl-1.5.5-23 2024-05-22 17:51:28 +03:00
shimon a96a6d56d7 update composer 2024-05-22 17:51:18 +03:00
shimon 24969ebc4f Merge remote-tracking branch 'origin/refactor-usage-sn' into refactor-usage-sn 2024-05-22 17:43:03 +03:00
Christy Jacob d979b2c997 Merge pull request #8180 from appwrite/feat-get-env-sn
Feat get env
2024-05-22 18:39:09 +04:00
shimon 355e2dc266 updating composer 2024-05-22 16:45:30 +03:00
shimon d201b0b099 updating composer 2024-05-22 16:44:30 +03:00
shimon 5b1a2038bf updating composer 2024-05-22 16:43:35 +03:00
shimon acbcadcbb9 Merge remote-tracking branch 'origin/refactor-usage-sn' into refactor-usage-sn 2024-05-22 16:40:38 +03:00
shimon 7c71e44250 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-get-env-sn 2024-05-22 16:39:42 +03:00
shimon 6639714a1b updating composer 2024-05-22 16:37:45 +03:00
Christy Jacob 139c6fa63b Merge pull request #8026 from appwrite/feat-worker-get-arg
getEnv on worker.php
2024-05-22 17:32:27 +04:00
Christy Jacob c3dba79009 Merge pull request #7592 from appwrite/feat-sms-locale
usage sms per country code count
2024-05-22 17:30:14 +04:00
shimon 72cfa82e8d updating composer 2024-05-22 16:03:47 +03:00
shimon 6e79d33ca2 Merge branch 'main' of github.com:appwrite/appwrite into feat-worker-get-arg
 Conflicts:
	composer.lock
2024-05-22 16:01:40 +03:00
Christy Jacob 8cf7335a14 Merge pull request #8173 from appwrite/refactor-localdevice-injection
Refactor localdevice injection
2024-05-22 16:57:26 +04:00
shimon 83f338ccb1 updating composer 2024-05-22 15:54:18 +03:00
shimon 074eab3d63 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
 Conflicts:
	composer.json
	composer.lock
2024-05-22 15:51:24 +03:00
navjotNSK c29fc5e72e hk added till cs.json 2024-05-22 16:43:40 +05:30
Jake Barnby 329b2e151d Merge pull request #8169 from appwrite/remove-pdo-exception
Remove throw PdoException in Error hook
2024-05-22 22:43:21 +12:00
Christy Jacob c45823a05d Merge pull request #8164 from appwrite/feat-add-schedule-function-tests
Add tests for scheduled functions
2024-05-22 13:57:18 +04:00
loks0n e1e4cb44f3 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-improve-header-demo-values 2024-05-22 10:52:06 +01:00
Khushboo Verma 7688d32857 Merge branch '1.5.x' into feat-add-schedule-function-tests 2024-05-22 14:56:03 +05:30
Jake Barnby 680cd5194d Fix returning hashed secrets 2024-05-22 14:11:06 +12:00