1
0
Fork 0
mirror of synced 2024-06-02 19:04:49 +12:00
Commit graph

11868 commits

Author SHA1 Message Date
Bradley Schofield 6dd9611162
Update container_name values 2024-05-15 06:50:59 +00:00
Bradley Schofield 74dd7297fa
Add changes to compose.phtml aswell 2024-05-15 06:46:21 +00: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
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
xue 4bb12a124d
Merge branch 'main' into feat-8003-missing-country-for-locale-endpoint-Palestine 2024-05-11 18:33:24 +03:00
Khushboo Verma 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
Khushboo Verma cd6878c597 Add comment for payload size 2024-05-09 15:11:02 +05:30
Steven Nguyen 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 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 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
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
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 Nguyen 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 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
Steven Nguyen 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 Jacob 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. Silver 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
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
Jake Barnby 0e9838d290
Remove logging and test files 2024-05-07 15:48:20 +12:00
Jake Barnby 912e3b01dc
Add clarifying comments 2024-05-07 14:07:04 +12:00
Steven Nguyen fabe6921b4
fix(auth): Fix MFA email verification code font
The font family was set to Inter without any fallback and since the
Inter isn't available in emails, the font rendered the default font,
Times New Roman. This commit adds a fallback font to the font-family
ensuring an sans-serif font like Inter is used.
2024-05-06 18:25:38 -07:00
Steven Nguyen 5b5505cf97
fix(auth): ensure session factors don't contain duplicates 2024-05-06 17:48:44 -07:00
Steven Nguyen 7e07f6b958
feat(auth): ensure user isn't kicked out after enabling MFA
User's were kicked out and forced to verify their session after enabling
MFA if they already had factors enabled. This change ensures that they
are not kicked out of their current session after MFA is enabled by
adding all relevant factors to the session.
2024-05-06 17:48:08 -07:00
Steven Nguyen 98d18ecc47
refactor(auth): remove auth duration from Auth::sessionVerify() calls
The paramter was removed from the method so we don't need to pass it
in anymore.
2024-05-06 17:16:56 -07:00
Sumanta 6f3aefdf16
fix: updated typo in credit-cards.php from Consosud to Cencosud 2024-05-07 00:51:58 +05:30
Jake Barnby 5e62007c8f
Fix dbForProject resources 2024-05-06 21:19:19 +12:00
Jake Barnby 52c52fa519
Add scheme to DSN on fail 2024-05-06 18:13:41 +12:00
shimon 27e460671b Merge branch 'main' of github.com:appwrite/appwrite into feat-worker-get-arg 2024-05-06 08:59:03 +03:00
Jake Barnby ec2878b505
Lint 2024-05-06 17:34:17 +12:00
Jake Barnby db94070162
Use DSN for project database 2024-05-06 17:33:36 +12:00
Sumanta Kabiraj e2248971a2
Merge branch 'main' into fix-8062-replace-misspelled-from-censosud-and-consosud-to-cencosud 2024-05-05 21:09:17 +05:30
xue ec14f31f9a
Merge branch 'main' into feat-8003-missing-country-for-locale-endpoint-Palestine 2024-05-05 15:44:19 +03:00
shimon 8e291f3700 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into fix-file-size-limit
 Conflicts:
	app/controllers/api/storage.php
	composer.lock
2024-05-05 11:52:49 +03:00
Eldad A. Fux b2c57e2d8b
Merge pull request #7934 from appwrite/fix-custom-domain
Prevent functions domain to be used as custom domain
2024-05-05 06:53:29 +01:00
Damodar Lohani 61af107c82
Merge pull request #7776 from appwrite/feat-react-native-sdk
React Native SDK
2024-05-05 11:09:46 +05:45
Damodar Lohani 74264582cc
Update proxy.php 2024-05-05 11:07:59 +05:45
Damodar Lohani 1094238820 add test 2024-05-05 04:56:49 +00:00
Damodar Lohani 9b0bacb1a2 Merge remote-tracking branch 'origin/refactor-usage-sn' into pea-699 2024-05-05 04:06:25 +00:00
Sumanta fc38b94732
fix: updated typo in credit-cards.php credit card image filename 2024-05-04 17:08:44 +05:30
Khushboo Verma e583f44147 Increase chunk size to 10 MB 2024-05-03 18:01:15 +05:30
loks0n c746fb40f8 chore: better name 2024-05-03 12:03:01 +01:00
loks0n 1295128b10 fix: use APP_VERSION_STABLE 2024-05-03 11:56:54 +01:00
Khushboo Verma f81f2e0411 Add publish: false flag 2024-05-03 15:39:08 +05:30
Jake Barnby c4deb0ba93
Allow shared tables namespace override 2024-05-03 21:30:38 +12:00
Jake Barnby a680b27e2b
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables 2024-05-03 19:07:23 +12:00
Christy Jacob 95300d796b
Revert "Update chunk size to 7 MB" 2024-05-03 10:19:03 +04:00
Jake Barnby 99d05b3d8c
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables 2024-05-03 14:24:57 +12:00
Christy Jacob 4c7432a891
Merge pull request #8060 from appwrite/feat-increase-chunk-size
Update chunk size to 7 MB
2024-05-02 23:28:34 +04:00
Khushboo Verma ce5dd899a5 Remove unnecessary code 2024-05-02 20:48:36 +05:30
Khushboo Verma abcd74d224 Remove logger code from avatars.php 2024-05-02 19:49:55 +05:30
Khushboo Verma 87fb11914e Update chunk size to 7 MB 2024-05-02 19:38:45 +05:30
loks0n 644bbe1f5b fix: version 2024-05-02 14:25:41 +01:00
loks0n 3ab9875ca7 feat: use x-appwrite-response-format 2024-05-02 14:16:35 +01:00
loks0n 2ed38271a0 feat: add version header 2024-05-02 13:51:19 +01:00
Khushboo Verma 89daa5e479 Update payload size to 11 MB to accomodate 10 MB chunk size 2024-05-02 14:30:18 +05:30
Jake Barnby d4254b34e2
Update db name 2024-05-02 18:28:03 +12:00
Khushboo Verma 885e7019f8 Update chunk size to 10 MB 2024-05-01 23:37:18 +05:30
Damodar Lohani 64d4ede05d mark beta 2024-05-01 08:55:45 +00:00
Darshan cc5a1436ad
Merge branch 'main' into fix-7999-internal-id-for-querying-deployments 2024-04-30 15:02:34 +05:30
Jake Barnby b2e956a14d
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	.gitignore
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/GetMigrationStats.php
#	src/Appwrite/Platform/Workers/Databases.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Hamster.php
#	tests/e2e/General/HTTPTest.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-04-30 19:40:47 +12:00
Jake Barnby 7140d8e6a5
Merge pull request #8036 from appwrite/feat-upgrade-db
Update database
2024-04-30 11:55:47 +12:00
Steven Nguyen 06e7efbd29
Merge pull request #7993 from fuyangpengqi/main
chore: fix some typos in comments
2024-04-29 16:41:24 -07:00
Steven Nguyen bfb51328fe
fix: version in error response
The APP_VERSION_STABLE constant should be used for the version
in API errors so that developers see a version that makes more
sense (such as 1.5.5).
2024-04-29 22:50:20 +00:00
ItzNotABug 02ece2637f fix: use resourceInternalId. 2024-04-29 15:54:22 +05:30
Jake Barnby aeea5e8328
Merge pull request #7341 from appwrite/collection-not-found
databases.php collection not found
2024-04-29 21:04:31 +12:00
Jake Barnby bcca318494
Merge remote-tracking branch 'origin/refactor-usage-sn-invalid-relationship' into feat-upgrade-db
# Conflicts:
#	composer.lock
2024-04-29 20:54:44 +12:00
Jake Barnby ecff8f5b7e
Update app/controllers/general.php 2024-04-29 20:16:09 +12:00
Jake Barnby 9a7c424e85
Update app/controllers/general.php 2024-04-29 16:52:46 +12:00
bhc 6adc75d7b4
Add PS to list of countries in phones.php 2024-04-27 01:17:22 +03:00
bhc a87b68cba8
Update translations for Palestine in multiple languages 2024-04-27 01:08:43 +03:00
bhc 5bf9ed7877
Add PS to list of countries in countries.php 2024-04-27 00:36:33 +03:00
Matej Bačo c768adacdc Re-enable experiment 4xx logging 2024-04-26 17:05:24 +02:00
Matej Bačo 0a85809532 Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x 2024-04-26 13:14:00 +02:00
Matej Bačo 9616de7576 Merge branch 'main' into refactor-usage-sn-1.5.x 2024-04-26 13:11:21 +02:00
Christy Jacob c7bdcda593
Merge pull request #8028 from appwrite/1.5.x
Sync 1.5.x into main
2024-04-26 15:10:09 +04:00
Christy Jacob 92c41954af Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn-1.5.x 2024-04-26 09:19:09 +00:00
Torsten Dittmann 644704155a
Merge pull request #8018 from appwrite/feat-1.5.5-release-prep
Prepare 1.5.5 release
2024-04-25 20:46:02 +02:00
Steven Nguyen 90ca2cde42
Merge pull request #7980 from appwrite/fix-usage-skip-main
Fix auth mode check
2024-04-25 11:32:36 -07:00
Steven Nguyen db9d9f9f05
Merge pull request #8023 from appwrite/feat-flutter-sdk-release
Release Flutter SDK
2024-04-25 11:31:52 -07:00
Steven Nguyen b02f0bc1bf
Merge pull request #8022 from appwrite/lohanidamodar-patch-3
Fix response code label
2024-04-25 11:30:02 -07:00
Steven Nguyen eb6eb98a4a
Bump appwrite version to 1.5.5 2024-04-25 17:44:04 +00:00
shimon 8588bb4555 getEnv on worker.php 2024-04-25 19:31:30 +03:00
Steven Nguyen 7172be25e2
Merge pull request #8020 from appwrite/fix-7945-mariadb-upgrade
Enable auto upgrade for mariadb container
2024-04-25 07:09:20 -07:00
Damodar Lohani b76f91218c fixes 2024-04-25 08:56:17 +00:00
Damodar Lohani 7e2c486ee1 Merge remote-tracking branch 'origin/1.5.x' into feat-react-native-sdk 2024-04-25 08:52:37 +00:00
Damodar Lohani 4c5118b219 update sdk version 2024-04-25 07:28:14 +00:00
Damodar Lohani f4d3d1dda0 update flutter version 2024-04-25 01:55:20 +00:00
Damodar Lohani e57b41d717 update specs 2024-04-25 01:41:52 +00:00
Damodar Lohani fbdaf7616c
Fix response code label 2024-04-25 07:19:02 +05:45
Damodar Lohani c8bf5f4328 simplify check 2024-04-25 01:23:01 +00:00
Damodar Lohani 4e66f8a8e2 simplify test 2024-04-25 01:01:15 +00:00
Steven Nguyen 73562fdb2b
fix(platform): update mariadb to auto upgrade on startup
There are times when we need to upgrade MariaDB. Setting this env
variable will have it automatically upgrade so the user doesn't need to
do anything.
2024-04-24 22:38:55 +00:00
Steven Nguyen 1cf0371ca1
Bump console to version 4.0.6 2024-04-24 22:04:30 +00:00
Steven Nguyen 6c87ee8ce6
Merge pull request #8017 from appwrite/chore-bump-console-4.0.6
Bump console to version 4.0.6
2024-04-24 14:09:30 -07:00
Steven Nguyen db6615ed2b
Bump console to version 4.0.6 2024-04-24 13:00:20 -07:00
shimon 4e639526d6 pull changes 2024-04-24 12:25:49 +03:00
Matej Bačo a99d9f3015 Disable experimental 4XX logging 2024-04-24 10:53:09 +02:00
Damodar Lohani 67cdde15f5
Update api.php 2024-04-24 09:03:08 +05:45
Damodar Lohani c163c84478
Merge branch 'main' into fix-usage-skip-main 2024-04-24 08:42:17 +05:45
Damodar Lohani ac95a7c5eb
Update api.php 2024-04-24 06:44:14 +05:45
Damodar Lohani dc3aa5e12f
revert 2024-04-24 06:30:32 +05:45
Steven Nguyen b62191a442
chore(locale): document standard for country codes
Since we use ISO 3166 standard for country codes, we should document it in the code so we can easily look up whether a country code is in the standard or not.
2024-04-23 17:06:45 -07:00
Steven Nguyen b75f5263a2
Merge branch 'main' into chore-sync-main-into-1.5.x 2024-04-23 23:43:53 +00:00
Steven Nguyen 3a2e9b6f4a
Merge pull request #7984 from appwrite/fix-mfa-admin-mode-condition
fix: mfa with admin mode
2024-04-23 15:21:02 -07:00
Steven Nguyen dd1bdf02c9
Merge pull request #7962 from deanurag/fix-7880-adding-hongkong-to-countries
FIX-7880-added-HongKong-to-countries.php
2024-04-23 15:06:17 -07:00
Christy Jacob f164c6d36a
Merge pull request #8007 from appwrite/feat-add-pf-flag
Add French Polynesia flag to flags.php
2024-04-24 00:01:08 +04:00
Torsten Dittmann 8b56e451f2
Merge pull request #8005 from appwrite/fix-8004-deleteMfaAuthenticator-response
Fix delete MFA authenticator response model
2024-04-23 10:17:14 +02:00
Anurag De 1ebfdc10ed
Merge branch 'main' into fix-7880-adding-hongkong-to-countries 2024-04-23 13:38:25 +05:30
Bradley Schofield 089af4e137
Update app/controllers/shared/api.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-23 16:34:12 +09:00
Bradley Schofield 3d17b64eac Add Null check before we access factors 2024-04-23 16:24:05 +09:00
Bradley Schofield 395ce93098 Update flags.php 2024-04-23 16:02:11 +09:00
Steven Nguyen f88887abad
fix(mfa): fix delete authenticator response model 2024-04-22 22:24:20 +00:00
Christy Jacob 2d8694baea
Merge pull request #7996 from appwrite/fix-users-exceeded-error
Update user create error message for console to be console specific
2024-04-22 17:20:00 +04:00
Milan Bačkonja b6f3d2d3e5 fix(appwrite-worker-mails): Added DB environment variables to appwrite-worker-mails 2024-04-22 12:04:49 +02:00
Anurag De 6d449965cb
Merge branch 'main' into fix-7880-adding-hongkong-to-countries 2024-04-19 10:09:02 +05:30
Vincent (Wen Yu) Ge be05844116 Update error for USER_CONSOLE_COUNT_EXCEEDED to just mention relevant variables 2024-04-18 18:18:34 -04:00
Vincent (Wen Yu) Ge c57fa3546f Ran formatter 2024-04-18 17:22:41 -04:00
Vincent (Wen Yu) Ge 404de48cc3 Update user create error message for console to be console specific 2024-04-18 17:08:47 -04:00
fuyangpengqi 2f5be1080f chore: fix some typos in comments
Signed-off-by: fuyangpengqi <995764973@qq.com>
2024-04-18 21:40:03 +08:00
fogelito 6a2b40db50 Remove redundent AppwriteException 2024-04-18 11:37:20 +03:00
fogelito 9d14fc75f1 Remove redundent AppwriteException 2024-04-18 11:36:27 +03:00
fogelito 0e8bc6b4b4 Fix bad copy 2024-04-18 11:25:03 +03:00
Shmuel Fogel 2fcbc4867b
Update app/controllers/general.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-18 11:08:15 +03:00
Shmuel Fogel 4d1698eab5
Update app/controllers/general.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-18 11:08:09 +03:00
fogelito b224aee2fe GENERAL_ACCESS_FORBIDDEN 2024-04-18 09:58:51 +03:00
fogelito a7318fdf8b Chnage message 2024-04-18 09:26:11 +03:00
Vincent (Wen Yu) Ge 9131c93a18 regen specs with fixed link 2024-04-17 16:06:55 -04:00
Matej Bačo 2551cf6fb1 Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x 2024-04-17 17:56:31 +02:00
fogelito cd9a274f79 Message x-appwrite-project 2024-04-17 16:17:44 +03:00
Torsten Dittmann 9150ceadc7 fix: mfa with admin mode 2024-04-17 11:10:33 +02:00
Steven Nguyen 2f7aff3a44
fix(auth): fix challenge type check
The factor parameter is case insensitive so we need to make sure
comparing the parameter to the constant is case insensitive too.
2024-04-16 23:44:46 -07:00
Damodar Lohani 083c220e37
fix auth mode check 2024-04-17 06:45:15 +05:45
Matej Bačo fd81c95e38 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into refactor-usage-sn 2024-04-16 09:59:24 +02:00
Matej Bačo 487d93bf04 Revert breaking changes 2024-04-16 09:59:02 +02:00
Eldad A. Fux 05dd17bd55
Merge pull request #7949 from appwrite/fix-factors-recovery-code
Add recovery code to List factors
2024-04-15 10:48:16 +02:00
Vincent (Wen Yu) Ge e491dfb9fc Generate specs 2024-04-12 20:18:14 +00:00
Anurag b381a5c7a6 Added HongKong to countries.php 2024-04-12 09:42:06 +05:30