Commit Graph

25060 Commits

Author SHA1 Message Date
Navjot Singh ade0472a5f Merge branch 'main' into bug-7880-location_hk_issue 2024-05-24 12:24:08 +05:30
Jake Barnby 074b807d8d Merge remote-tracking branch 'origin/refactor-usage-sn' into sync-1.5.x-with-cloud 2024-05-24 16:56:57 +12:00
Jake Barnby 7d18de95ce Merge pull request #7870 from appwrite/fix-setting-secrets
Fix not hiding tokens for clients via realtime
2024-05-24 16:53:36 +12:00
Jake Barnby 4ed125f7c8 Remove random shared tables assignment in preparation of setting as override instead 2024-05-24 16:53:09 +12:00
Jake Barnby a895ce4270 Remove redundant backup checks 2024-05-24 16:51:29 +12:00
Jake Barnby aa8460cfb9 Merge remote-tracking branch 'origin/refactor-usage-sn' into sync-1.5.x-with-cloud 2024-05-24 16:40:18 +12:00
Jake Barnby 7b76455f0b Merge pull request #8192 from appwrite/fix-realtime-stats
Wrap realtime stats in an edition check
2024-05-24 16:39:55 +12:00
Jake Barnby 75d6a7e2a0 Wrap realtime stats in an edition check 2024-05-24 16:34:43 +12:00
Jake Barnby fc7a676dbb Merge remote-tracking branch 'origin/refactor-usage-sn' into sync-1.5.x-with-cloud 2024-05-24 15:47:12 +12:00
Jake Barnby 15ebad5548 Merge pull request #8190 from appwrite/chore-update-executor-host-default-var
Chore update executor host default var
2024-05-24 15:46:35 +12:00
Jake Barnby ddc7de7b7f Merge pull request #8191 from appwrite/chore-update-submodule
Chore update submodule
2024-05-24 15:46:17 +12:00
Jake Barnby 3da213434f Update to 4.3.3 to match cloud 2024-05-24 15:40:42 +12:00
Jake Barnby 96bc307fcd Checkout 4.3.2 2024-05-24 15:39:26 +12:00
Jake Barnby 3eec8317d4 Improve variable desc copy 2024-05-24 15:31:17 +12:00
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