Jake Barnby
e19b465ce2
Move shared tables db to env var from const
2024-05-24 20:10:47 +12:00
Navjot Singh
ade0472a5f
Merge branch 'main' into bug-7880-location_hk_issue
2024-05-24 12:24:08 +05:30
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
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
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
Binyamin Yawitz
ebe386acd9
feat(logger): Unifying logger environment variable and adapting to the latest Logger version
2024-05-23 12:44:19 -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
Khushboo Verma
f0de4c6eac
Resolved merge conflict
2024-05-23 18:34:48 +05:30
navjotNSK
fcbab74f04
All translations added.
2024-05-23 15:55:57 +05:30
ItzNotABug
81e8502a78
fix: dont override humans.txt too.
2024-05-23 15:54:12 +05:30
navjotNSK
2621d948c6
All translations added.
2024-05-23 15:53:59 +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
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
navjotNSK
c29fc5e72e
hk added till cs.json
2024-05-22 16:43:40 +05:30
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
Binyamin Yawitz
e1863053ad
refactor(messaging worker): Adding volume and volume variables
2024-05-21 15:51:32 -04:00
Binyamin Yawitz
ab0d6f7c19
refactor(messaging worker): Refactoring local device to worker only
2024-05-21 15:48:53 -04:00
Steven Nguyen
cc6129fd20
Merge branch '1.5.x' into chore-bump-console-4.3.2
2024-05-21 12:45:29 -07:00
Steven Nguyen
c2c4171d36
Bump console to version 4.3.2
2024-05-21 18:26:39 +00:00
Steven Nguyen
69f53492fd
Merge branch '1.5.x' into chore-release-sdks
2024-05-21 08:47:18 -07:00
Steven Nguyen
bc74d1eee7
Bump console to version 4.3.1
2024-05-21 14:40:31 +00:00
Matej Bačo
a115f878b3
Merge remote-tracking branch 'origin/1.6.x' into feat-function-tokens
2024-05-21 10:28:21 +00:00
Christy Jacob
90bfd77483
Merge pull request #8067 from appwrite/fix-dont-publish-max-users-exceed
...
Fix don't publish max users exceed
2024-05-21 14:25:12 +04:00
Khushboo Verma
df340c0e5b
Update code to 400
2024-05-21 15:53:38 +05:30
fogelito
795b595052
Remove throw
2024-05-21 10:18:13 +03:00
Steven Nguyen
f0f2e5217c
chore: bump SDK versions
2024-05-20 15:54:37 -07:00
Steven Nguyen
99a9c809ed
chore: regenerate specs
2024-05-20 15:30:11 -07:00
Steven Nguyen
1269294ff5
Bump appwrite version to 1.5.6
2024-05-20 15:27:52 -07: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
loks0n
93dc9befd9
refactor-usage-sn specs and composer
2024-05-20 18:13:01 +01:00
loks0n
04ed5f3894
revert specs
2024-05-20 18:11:06 +01:00
loks0n
f2d1b79b02
chore: specs
2024-05-20 17:57:39 +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
Luke B. Silver
cde4e908f4
Update errors.php
2024-05-20 13:12:28 +01:00
Luke B. Silver
a4dfc135e5
Update app/config/errors.php
...
Co-authored-by: Matej Bačo <matejbacocom@gmail.com>
2024-05-20 13:11:52 +01:00
Christy Jacob
984da4f4ac
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main
2024-05-20 11:05:24 +00: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
loks0n
bfe12710da
chore: specs
2024-05-20 11:08:23 +01:00
loks0n
b3080f0c0a
Merge branch 'fix-improve-cold-start-error' of https://github.com/appwrite/appwrite into fix-improve-cold-start-error
2024-05-20 11:07:28 +01:00
loks0n
4d572d4a05
chore: errors.php
2024-05-20 11:05:53 +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
shimon
8aabb92fda
adding requests count on error
2024-05-19 13:50:25 +03:00
Luke B. Silver
ae321268b5
Merge branch 'main' into fix-improve-cold-start-error
2024-05-18 13:53:02 +01:00
Luke B. Silver
237bec49b2
Merge branch 'main' into chore-remove-compose-version
2024-05-18 13:52:48 +01:00
Steven Nguyen
6493dd943f
Merge pull request #8133 from appwrite/remove-obsolete-tasks
...
chore: cleanup obsolete tasks
2024-05-17 16:37:55 -07:00
loks0n
095baab24a
chore: update executer in compose
2024-05-17 20:50:40 +01:00
loks0n
2c19bb0a1d
chore: more deletions
2024-05-17 20:46:14 +01:00
Luke B. Silver
0d5d5336ed
Merge branch '1.5.x' into feat-improve-header-demo-values
2024-05-17 18:20:18 +01:00
loks0n
3d119ad1a6
fix: improve cold start error
2024-05-17 18:16:10 +01:00
Matej Bačo
d57c459e6f
Merge branch '1.6.x' into feat-function-tokens
2024-05-17 18:16:43 +02:00
bhc
82b473c8ee
Update Chinese language native names in languages.php
2024-05-17 17:39:35 +03:00
shimon
2d4e0ddde2
Merge remote-tracking branch 'origin/refactor-usage-sn' into refactor-usage-sn
2024-05-17 17:35:48 +03: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
Steven Nguyen
49fc75e59d
Bump console to version 4.3.0
2024-05-16 21:13:32 +00:00
shimon
dae9cb995c
adding requests count on error
2024-05-16 21:21:21 +03:00
shimon
cc3f975101
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into chore-error-requests-count
2024-05-16 21:15:21 +03:00
Matej Bačo
2e1f67245d
Fix bugs, add old api key test
2024-05-16 08:39:15 +00:00
Khushboo Verma
8ecc2ee787
Remove hyphen
2024-05-16 14:03:51 +05:30
Christy Jacob
dabb5d18af
Merge branch 'main' into remove-obsolete-tasks
2024-05-16 12:14:07 +04: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
shimon
12e4f49cba
adding requests count on error
2024-05-15 20:25:29 +03:00
Luke B. Silver
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. Silver
8ff98bcb41
Merge branch '1.5.x' into feat-add-version-header
2024-05-15 10:30:36 +01:00
shimon
c38a598d3a
adding requests count on error
2024-05-15 09:52:05 +03:00
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
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 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
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 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 824309e4e62d09a3a17b
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
Matej Bačo
9252b66493
Add scope tests
2024-05-06 11:27:28 +00:00
Matej Bačo
3a3d5b61a6
PR review changes
2024-05-06 09:55:59 +00:00
Jake Barnby
5e62007c8f
Fix dbForProject resources
2024-05-06 21:19:19 +12:00
Matej Bačo
448b0a5607
Re-add api token auth
2024-05-06 08:35:27 +00:00
