Christy Jacob
991a22f642
Merge pull request #8290 from appwrite/1.5.x
...
Sync 1.5.x into refactor-usage-sn
2024-06-21 00:38:21 +05:30
Christy Jacob
868e57a9a3
Merge pull request #8281 from appwrite/main
...
Sync main into 1.5.x
2024-06-19 12:18:12 +05:30
Damodar Lohani
a93dcfa1b3
Update storage.php
2024-06-18 11:46:31 +05:45
Steven Nguyen
4b24848f22
Merge pull request #8236 from 2002Bishwajeet/fix-user-model
...
Fix: Don't set the target field if the existing target document is false
2024-06-17 17:11:27 -07:00
Damodar Lohani
3dcd1314f5
fix file size multiplier
2024-06-17 04:50:22 +00:00
choir27
84d9b4befe
docs: fix hyperlink in storage code snippet
2024-06-13 09:59:20 -04:00
Bishwajeet Parhi
190560b8ef
chore: append attributes instead of replace
2024-06-11 21:17:25 +05:30
Jake Barnby
a4c1275764
Add abuse limit for update password
2024-06-10 18:09:30 +12:00
Jake Barnby
3c123d372a
Merge pull request #8244 from appwrite/1.5.x
...
Sync 1.5.x into refactor-usage-sn
2024-06-10 12:22:16 +12:00
Steven Nguyen
a09a09a7a9
fix(auth): fix MFA verification for OAuth2 sessions
...
Before this, users who only signed in with OAuth2 were not able to
verify their sessions with MFA because their session already used an
email factor and they couldn't use an additional email factor.
This commit changes the OAuth2 session to include 2 factors: email and
oauth2. This second special factor is used to bypass MFA checks. It is
fine to bypass MFA checks because OAuth2 is supposed to handle the
entire authentication process, verifying who the user is and we, as the
resource provider, only need to trust the OAuth2 provider.
2024-06-07 16:45:14 -07:00
Jake Barnby
9e487b8ccf
Revert "Merge pull request #8237 from appwrite/revert-8193-feat-remove-random-shared-tables"
...
This reverts commit 930ae6ded01f6417b156
2024-06-06 20:11:19 +12:00
Christy Jacob
ff6efc2855
Revert "Feat remove random shared tables"
2024-06-06 00:11:56 +05:30
Bishwajeet Parhi
cccda2a46c
fix: Don't set target attribute if no existing Target found
2024-06-05 23:34:01 +05:30
Jake Barnby
f459a5c458
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-remove-random-shared-tables
...
# Conflicts:
# docker-compose.yml
2024-06-04 17:43:14 +12:00
Bradley Schofield
d4db55ab77
Fix failed queue param in failed jobs
2024-05-29 18:11:58 +09:00
Christy Jacob
1c79ccd231
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x
2024-05-27 11:26:32 +00:00
Damodar Lohani
2b8bf3b252
Merge pull request #8120 from appwrite/chore-error-requests-count
...
Chore:usage requests count on error
2024-05-26 07:04:33 +05:45
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
Matej Bačo
8dd883a312
Add comments
2024-05-24 13:04:30 +02:00
Jake Barnby
bbb4b0bc12
Remove shared table headers
2024-05-24 20:29:25 +12:00
Jake Barnby
e19b465ce2
Move shared tables db to env var from const
2024-05-24 20:10:47 +12: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
4ed125f7c8
Remove random shared tables assignment in preparation of setting as override instead
2024-05-24 16:53:09 +12:00
Jake Barnby
a895ce4270
Remove redundant backup checks
2024-05-24 16:51:29 +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
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
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
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 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
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
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
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
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
