Commit Graph
15760 Commits
Author SHA1 Message Date
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
shimon 12e4f49cba adding requests count on error 2024-05-15 20:25:29 +03:00
Luke B. SilverandGitHub 44ef0c365a Merge branch '1.5.x' into feat-improve-header-demo-values 2024-05-15 17:30:21 +01:00
Khushboo Verma 503495df16 Update executor image name to exc-1 2024-05-15 18:32:37 +05:30
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. SilverandGitHub 8ff98bcb41 Merge branch '1.5.x' into feat-add-version-header 2024-05-15 10:30:36 +01:00
fogelito 87e0d167e2 Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into check-cursor-value
 Conflicts:
	composer.lock
2024-05-15 10:57:25 +03:00
shimon c38a598d3a adding requests count on error 2024-05-15 09:52:05 +03:00
Bradley SchofieldandGitHub 6dd9611162 Update container_name values 2024-05-15 06:50:59 +00:00
Bradley SchofieldandGitHub 74dd7297fa Add changes to compose.phtml aswell 2024-05-15 06:46:21 +00:00
Matej Bačo 37176e7865 Backwards compatible approach 2024-05-14 12:33:49 +00:00
Matej Bačo 4d249c5d36 Bug fix 2024-05-14 12:27:35 +00:00
Matej Bačo 9846b573bd Merge remote-tracking branch 'origin/main' into feat-function-tokens 2024-05-14 11:59:43 +00:00
Matej Bačo 54c953d559 Add prefix of api key types 2024-05-14 11:58:31 +00:00
Torsten DittmannandGitHub 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 NguyenandGitHub 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
shimon 989b0d9f10 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale 2024-05-12 15:29:00 +03:00
shimon 74c15f51ff Merge branch 'main' of github.com:appwrite/appwrite into feat-worker-get-arg 2024-05-12 11:14:46 +03:00
xueandGitHub 4bb12a124d Merge branch 'main' into feat-8003-missing-country-for-locale-endpoint-Palestine 2024-05-11 18:33:24 +03:00
Khushboo VermaandGitHub 7bb5ce9cb6 Merge pull request #8099 from appwrite/feat-increase-chunk-size-to-10-MB
Increase chunk size to 10 MB
2024-05-10 17:53:44 +05:30
fogelito 661329b977 Invalid cursor value 2024-05-09 19:54:28 +03:00
Matej Bačo 5002b0f3fa PR review changes 2024-05-09 11:50:45 +00:00
Khushboo Verma cd6878c597 Add comment for payload size 2024-05-09 15:11:02 +05:30
Damodar Lohani 1d9f5fa29d Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-upgrade-platform-with-module 2024-05-09 07:50:17 +00:00
Steven NguyenandGitHub e5f49b420c fix(realtime): handle SQL error code 'HY000'
SQL can throw an error where the code is a string like 'HY000', but
$server->close() expects an integer. This change ensures we only pass
an integer into $server->close().
2024-05-09 05:55:34 +00:00
Steven NguyenandSteven 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 NguyenandGitHub fa78ae078f fix(realtime): disable sending realtime stats
Disable sending realtime stats because the $database->find('realtime')
is throwing:

> Cannot execute queries while other unbuffered queries are active.

In addition, the realtime stats are not being collected so there's no
point in having this enabled.
2024-05-08 21:37:46 +00:00
Eldad Fux 525383c725 Updates to realtime 2024-05-08 21:01:07 +01:00
Steven NguyenandGitHub 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
Eldad Fux 5cfe4db839 Updated console 2024-05-08 18:24:15 +01:00
Eldad Fux c53de9fb6b Merge branch 'main' of github.com:appwrite/appwrite into feat-eldad4-coroutines 2024-05-08 18:21:55 +01:00
shimon 17b9f136f1 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
 Conflicts:
	composer.json
	composer.lock
	src/Appwrite/Platform/Workers/Messaging.php
2024-05-08 14:05:14 +03: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
loks0n f1a344a119 chore: specs 2024-05-07 20:02:15 +01:00
Steven NguyenandGitHub 0f369b0393 Merge pull request #8074 from infysumanta/fix-8062-replace-misspelled-from-censosud-and-consosud-to-cencosud
fix: updated typo in credit-cards.php credit card image filename
2024-05-07 10:43:54 -07:00
Torsten DittmannandGitHub 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
Steven NguyenandGitHub 7ea7c83415 Merge pull request #8082 from appwrite/fix-mfa-email-verification-code-font
Fix MFA email verification code font
2024-05-07 07:40:09 -07:00
Christy JacobandGitHub 2abd016fe5 Merge pull request #8048 from appwrite/fix-8039-version-in-response
Fix version in error response
2024-05-07 18:39:47 +04:00
Luke B. SilverandGitHub 2d09a3a17b Merge branch '1.5.x' into feat-add-version-header 2024-05-07 11:34:02 +01: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