Commit Graph
16599 Commits
Author SHA1 Message Date
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 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 BarnbyandGitHub 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 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 BarnbyandGitHub 5510a25066 Merge pull request #8148 from appwrite/chore-remove-compose-version
chore: remove compose version
2024-05-24 13:47:40 +12:00
Christy JacobandGitHub 4a4d5109e2 Merge branch '1.5.x' into sync-1.5.x-with-cloud 2024-05-23 23:36:13 +04: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 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 NguyenandGitHub 9db92698dc fix(cache): use the same cache key when loading and saving files 2024-05-22 23:23:16 +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 NguyenandGitHub 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 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 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
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
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 BarnbyandGitHub 329b2e151d Merge pull request #8169 from appwrite/remove-pdo-exception
Remove throw PdoException in Error hook
2024-05-22 22:43:21 +12: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
Jake Barnby 680cd5194d Fix returning hashed secrets 2024-05-22 14:11:06 +12:00
Jake Barnby c7106b9147 Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets 2024-05-22 12:50:58 +12:00
Binyamin Yawitz e1863053ad refactor(messaging worker): Adding volume and volume variables 2024-05-21 15:51:32 -04:00
Binyamin Yawitz ab0d6f7c19 refactor(messaging worker): Refactoring local device to worker only 2024-05-21 15:48:53 -04:00
Steven NguyenandGitHub cc6129fd20 Merge branch '1.5.x' into chore-bump-console-4.3.2 2024-05-21 12:45:29 -07:00
Steven NguyenandGitHub c2c4171d36 Bump console to version 4.3.2 2024-05-21 18:26:39 +00:00
Steven NguyenandGitHub 69f53492fd Merge branch '1.5.x' into chore-release-sdks 2024-05-21 08:47:18 -07:00
Steven NguyenandGitHub bc74d1eee7 Bump console to version 4.3.1 2024-05-21 14:40:31 +00:00
Matej Bačo a115f878b3 Merge remote-tracking branch 'origin/1.6.x' into feat-function-tokens 2024-05-21 10:28:21 +00:00
Christy JacobandGitHub 90bfd77483 Merge pull request #8067 from appwrite/fix-dont-publish-max-users-exceed
Fix don't publish max users exceed
2024-05-21 14:25:12 +04:00
Khushboo Verma df340c0e5b Update code to 400 2024-05-21 15:53:38 +05:30
fogelito 795b595052 Remove throw 2024-05-21 10:18:13 +03:00
Steven Nguyen f0f2e5217c chore: bump SDK versions 2024-05-20 15:54:37 -07:00