Damodar Lohani
66ac96580b
Merge branch 'main' into feat-security-emails
2024-06-04 06:51:24 +05:45
Christy Jacob
3a63ee834a
Merge branch '1.5.x' into prepare-1.5.7
2024-05-24 19:55:59 +04:00
Christy Jacob
c76dbaaadb
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into prepare-1.5.7
2024-05-24 15:53:43 +00:00
loks0n
d73a9e75cd
refactor: remove version format const
2024-05-24 16:27:13 +01:00
loks0n
ad3cc4e68f
fix: typo
2024-05-24 16:16:57 +01:00
Luke B. Silver
a92713d3a2
Merge branch '1.5.x' into feat-add-version-header
2024-05-24 16:08:11 +01:00
loks0n
cb4c15ce0a
ui: improve warning message
2024-05-24 16:07:22 +01:00
Christy Jacob
e55f0adab2
Merge pull request #8185 from ItzNotABug/fix-robots-txt
...
Fix: Don't Override `robots.txt` for Other Domains
2024-05-24 17:15:34 +04:00
Christy Jacob
0e7c417d67
Merge pull request #8089 from appwrite/feat-improve-header-demo-values
...
feat: improve header demo values
2024-05-24 17:09:09 +04:00
Christy Jacob
0fcb76570d
Merge branch '1.5.x' into prepare-1.5.7
2024-05-24 17:07:57 +04:00
Matej Bačo
1109782af0
Update console
2024-05-24 15:06:52 +02: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
ac49f7497a
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into prepare-1.5.7
2024-05-24 12:43:03 +00:00
Matej Bačo
8dd883a312
Add comments
2024-05-24 13:04:30 +02:00
Christy Jacob
99a6e81b0d
chore: update specs
2024-05-24 11:03:49 +00:00
Christy Jacob
8c851ecdfb
chore: remove specs
2024-05-24 10:58:06 +00:00
Christy Jacob
c2215ef171
chore: update console
2024-05-24 10:57:31 +00:00
Christy Jacob
344f926c8e
chore: update console
2024-05-24 10:55:34 +00:00
Luke B. Silver
b52de356e9
Merge branch '1.5.x' into feat-improve-header-demo-values
2024-05-24 11:17:28 +01:00
loks0n
6eae908e5e
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-improve-header-demo-values
2024-05-24 11:16:54 +01:00
Christy Jacob
75de5b0332
chore: update specs
2024-05-24 09:35:57 +00:00
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
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
ItzNotABug
81e8502a78
fix: dont override humans.txt
too.
2024-05-23 15:54:12 +05:30
ItzNotABug
5462b83d3c
fix: don't override robots.txt
for other domains.
2024-05-23 14:47:59 +05:30
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
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
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
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