1
0
Fork 0
mirror of synced 2024-09-07 21:31:38 +12:00
Commit graph

6040 commits

Author SHA1 Message Date
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
074b807d8d
Merge remote-tracking branch 'origin/refactor-usage-sn' into sync-1.5.x-with-cloud 2024-05-24 16:56:57 +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
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
Jake Barnby
5b82716986
Change from 1 in 20 to 1 in 5 projects on shared tables DB 2024-05-20 14:00:48 +12:00
Luke B. Silver
ae321268b5
Merge branch 'main' into fix-improve-cold-start-error 2024-05-18 13:53:02 +01:00
loks0n
3d119ad1a6 fix: improve cold start error 2024-05-17 18:16:10 +01:00
Bradley Schofield
deacaa2d6f Multiple Changes, See Desc
- Update Logger from 0.3.* to 0.5.*
- Add old sentry syntax conversion
- Add sampler for experiment logger, and set it to 4%
2024-05-17 18:01:33 +09:00
Christy Jacob
10722aa736 chore: cleanup obsolete tasks and workers 2024-05-16 07:11:00 +00:00
Ketan Baitule
894f001c7a
Update app/controllers/api/teams.php
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-05-16 08:00:46 +05:30
Steven Nguyen
03fd62cc04
Merge branch 'main' into 1.5.x 2024-05-15 11:36:15 -07:00
loks0n
e73b4b8573 feat: generic approach 2024-05-15 10:46:31 +01:00
Ketan Baitule
6ff3fc5c6b fix: Allow Adding User Over Limit From Console In Team Membership 2024-05-15 15:03:46 +05:30
Luke B. Silver
8ff98bcb41
Merge branch '1.5.x' into feat-add-version-header 2024-05-15 10:30:36 +01:00
Torsten Dittmann
0365f4818b
Merge pull request #8102 from appwrite/fix-7268-oauth-apple-name
Fix email used for name when user is created via Apple OAuth2
2024-05-14 11:40:45 +02:00
Steven Nguyen
1626168d37
fix(project): set limit to retrieve all stats for the usage range
Because limit was not passed for the find() query, the limit defaulted to 25. As such, when requesting stats for the last 30 days, only the last 25 were retrieved.
2024-05-13 21:23:47 +00:00
Steven Nguyen
c76e29077c
feat(auth): try to get user name from request param if not from oauth2
This is only applicable for Apple OAuth2 because this is the only
provider that does not return user name from an API call and only
returns the name in the callback URL.

Reference:
* https://developer.apple.com/documentation/sign_in_with_apple/sign_in_with_apple_js/incorporating_sign_in_with_apple_into_other_platforms#3332115
2024-05-08 16:35:17 -07:00
Steven Nguyen
df064adce3
feat(auth): forward OAuth2 callback params
The only place Apple includes the user's name is in the params so we
need to forward the params to the redirect endpoint so they can be used
when creating the user.
2024-05-08 17:36:46 +00:00
loks0n
91ee67d69f Revert "Merge branch 'main' of https://github.com/appwrite/appwrite into feat-add-version-header"
This reverts commit 824309e4e6, reversing
changes made to 2d09a3a17b.
2024-05-08 10:09:28 +01:00
loks0n
0aadda9605 chore: steven review 2024-05-08 10:07:10 +01:00
Jake Barnby
f01922daf9
Fix syntax error 2024-05-08 21:06:30 +12:00
loks0n
824309e4e6 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-add-version-header 2024-05-08 10:05:23 +01:00
Jake Barnby
6e3dee4e1f
Fix shared tables db queue name 2024-05-08 16:25:12 +12:00
Jake Barnby
f7cd1e2361
Ensure namespace is set if override equals shared tables 2024-05-08 16:04:28 +12:00
Torsten Dittmann
239a0b4dde
Merge pull request #8081 from appwrite/fix-dont-kick-after-enabling-mfa
Don't kick user and require verification after enabling MFA
2024-05-07 17:49:18 +02:00
Jake Barnby
921eb2b900
App::getEnv -> System::getEnv 2024-05-07 22:08:00 +12:00
Matej Bačo
08bf5aace4 Mark email verified after email OTP 2024-05-07 09:01:57 +00:00
Jake Barnby
e9bac08de0
Fix header test 2024-05-07 17:59:24 +12:00
Jake Barnby
356d155df2
Add shared tables enabled flag for quick toggle 2024-05-07 17:29:12 +12:00
Jake Barnby
74a147f3b2
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables
# Conflicts:
#	tests/e2e/Services/Projects/ProjectsCustomServerTest.php
2024-05-07 15:53:58 +12:00