Christy Jacob
6ea2177818
Merge pull request #8196 from appwrite/sync-with-main
...
Sync with main
2024-05-24 17:07:42 +04:00
Christy Jacob
cd5f6f58a2
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main
2024-05-24 12:43:56 +00:00
Christy Jacob
9f2030fb8c
Merge pull request #8147 from appwrite/chore-rename-executor-image-name
...
Update executor image name
2024-05-24 16:40:39 +04:00
Christy Jacob
74a9995220
Merge pull request #8188 from appwrite/sync-1.5.x-with-cloud
...
Sync 1.5.x with cloud
2024-05-24 16:39:52 +04:00
Matej Bačo
8dd883a312
Add comments
2024-05-24 13:04:30 +02:00
Christy Jacob
e266791547
chore: update changelog
2024-05-24 09:51:56 +00:00
Christy Jacob
02acee9e2b
chore: fix merge conflicts
2024-05-24 09:51:28 +00:00
Khushboo Verma
357409c508
Merge conflicts in CHANGES.md
2024-05-24 13:03:41 +05:30
Khushboo Verma
da3ff7f8ec
Merge branch 'chore-rename-executor-image-name' of github.com:appwrite/appwrite into chore-rename-executor-image-name
2024-05-24 12:56:00 +05:30
Christy Jacob
2005ddfe47
chore: update env variable
2024-05-24 07:25:39 +00:00
Khushboo Verma
ca1f760905
Update executor hostname in variables
2024-05-24 12:55:32 +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
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
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
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
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
Christy Jacob
Matej Bačo
Khushboo Verma
Jake Barnby
Steven Nguyen
Torsten Dittmann
shimon