Commit Graph

21232 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 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
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
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 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 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
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
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
Jake Barnby f03281a474 Fix project tests 2024-05-22 13:42:34 +12:00
Jake Barnby 93f50e1e0e Lint 2024-05-22 12:51:27 +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 b99628669b Merge pull request #8172 from appwrite/chore-bump-console-4.3.2
Bump console to version 4.3.2
1.5.6
2024-05-21 13:45:56 -07: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 12ac38c079 Merge pull request #8168 from appwrite/chore-release-sdks
Release SDKs
2024-05-21 11:52:07 -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
Torsten Dittmann d00aad9d30 Merge pull request #8170 from appwrite/chore-bump-console-4.3.1
Bump console to version 4.3.1
2024-05-21 17:42:38 +02:00
Steven Nguyen bc74d1eee7 Bump console to version 4.3.1 2024-05-21 14:40:31 +00:00
Khushboo Verma 1767d885c2 Merge branch '1.5.x' into feat-add-schedule-function-tests 2024-05-21 19:23:12 +05:30
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