Commit Graph

11822 Commits

Author SHA1 Message Date
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 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 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 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
Christy Jacob 4a4d5109e2 Merge branch '1.5.x' into sync-1.5.x-with-cloud 2024-05-23 23:36:13 +04: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 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 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 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
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
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
Steven Nguyen cc6129fd20 Merge branch '1.5.x' into chore-bump-console-4.3.2 2024-05-21 12:45:29 -07:00
Steven Nguyen c2c4171d36 Bump console to version 4.3.2 2024-05-21 18:26:39 +00:00
Steven Nguyen 69f53492fd Merge branch '1.5.x' into chore-release-sdks 2024-05-21 08:47:18 -07:00
Steven Nguyen bc74d1eee7 Bump console to version 4.3.1 2024-05-21 14:40:31 +00:00
Christy Jacob 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
Steven Nguyen 99a9c809ed chore: regenerate specs 2024-05-20 15:30:11 -07:00
Steven Nguyen 1269294ff5 Bump appwrite version to 1.5.6 2024-05-20 15:27:52 -07:00
loks0n ff1cabdbf7 chore: refactor finally clause 2024-05-20 22:35:40 +01:00
Steven Nguyen 47ed708293 Merge branch 'main' into chore-sync-with-main 2024-05-20 19:03:54 +00:00
Steven Nguyen 91748b1bd5 Merge branch 'main' into fix-5516-in-team-membership-allow-adding-user-over-limit-from-console-or-apikey 2024-05-20 11:40:58 -07:00
Steven Nguyen 722f3291fa Merge branch 'main' into chore-sync-with-main 2024-05-20 18:33:52 +00:00
loks0n 6bd407eae9 chore: refactor finally block 2024-05-20 18:55:15 +01:00
loks0n 93dc9befd9 refactor-usage-sn specs and composer 2024-05-20 18:13:01 +01:00
loks0n 04ed5f3894 revert specs 2024-05-20 18:11:06 +01:00
loks0n f2d1b79b02 chore: specs 2024-05-20 17:57:39 +01:00
Christy Jacob d258240f08 Merge pull request #8152 from appwrite/fix-improve-cold-start-error
fix: improve cold start error
2024-05-20 17:26:58 +01:00
Luke B. Silver cde4e908f4 Update errors.php 2024-05-20 13:12:28 +01:00
Luke B. Silver a4dfc135e5 Update app/config/errors.php
Co-authored-by: Matej Bačo <matejbacocom@gmail.com>
2024-05-20 13:11:52 +01:00
loks0n b3c00c4d32 chore: create doc 2024-05-20 11:46:41 +01:00
loks0n 863a2ce0a9 chore: matej review 2024-05-20 11:44:08 +01:00
loks0n bfe12710da chore: specs 2024-05-20 11:08:23 +01:00
loks0n b3080f0c0a Merge branch 'fix-improve-cold-start-error' of https://github.com/appwrite/appwrite into fix-improve-cold-start-error 2024-05-20 11:07:28 +01:00
loks0n 4d572d4a05 chore: errors.php 2024-05-20 11:05:53 +01:00