Bradley Schofield
667b69e146
Merge branch '1.5.x' into feat-runtime-controls-1.5.x
2024-07-17 17:04:04 +09:00
loks0n
d765c76576
fix: typo
2024-07-16 14:42:46 +01:00
loks0n
20e77a1e9e
feat: optimise
2024-07-16 13:03:26 +01:00
loks0n
67ec4b49ed
feat: only send after first session
2024-07-16 13:01:23 +01:00
Bradley Schofield
a57cc0a18e
Address Christy's comments
2024-07-16 20:00:00 +09:00
Bradley Schofield
372ad6ce43
Update mbSeconds calculation to use cpu cores
2024-07-16 19:12:40 +09:00
Bradley Schofield
e3b123d559
Implement Runtime Sizes instead of individual memory and cpu
2024-07-16 14:26:53 +09:00
Damodar Lohani
0374711298
Update projects.php
2024-07-16 06:53:21 +05:45
Khushboo Verma
e6686bd3dd
Add APPWRITE_REGION in env var
2024-07-15 12:40:11 +05:30
Bradley Schofield
8222aa74ca
Merge branch '1.5.x' into feat-sn-implement-deployment-metric
2024-07-15 13:59:47 +09:00
Bradley Schofield
8ef309a4aa
Run Linter
2024-07-15 11:59:02 +09:00
Damodar Lohani
8d52cb0f6b
Merge remote-tracking branch 'origin/1.6.x' into feat-project-accessed-at
2024-07-14 10:18:54 +00:00
Bradley Schofield
fce118ff34
Move GBHours to 1.5.x
2024-07-12 19:02:32 +09:00
Bradley Schofield
824a70f936
Move Runtime Controls PR to 1.5.x
2024-07-12 18:25:57 +09:00
Binyamin Yawitz
0988fd7581
improve: events data
2024-07-11 11:03:28 -04:00
Bradley Schofield
1eb178bde9
Merge branch '1.6.x' into feat-update-delete-authenticator
2024-07-10 16:27:28 +09:00
Damodar Lohani
f4a4ec1def
Merge branch '1.6.x' into feat-project-accessed-at
2024-07-10 13:01:00 +05:45
Jake Barnby
b343158d19
Merge remote-tracking branch 'origin/main' into 1.6.x
...
# Conflicts:
# .gitmodules
# app/console
# composer.lock
# tests/e2e/Services/Health/HealthCustomServerTest.php
2024-07-10 19:11:04 +12:00
Matej Bačo
e02261d09f
Fix download deployment
2024-07-08 10:06:01 +02:00
Bradley Schofield
996911e385
Update delete authenticator to remove OTP Validation
2024-07-08 10:42:27 +09:00
Damodar Lohani
61333908a5
set project accessed at while creating
2024-07-08 01:11:09 +00:00
Steven Nguyen
f32cfa6827
Merge pull request #8346 from appwrite/update-functions-api
...
docs: update functions api reference
2024-07-03 21:57:58 -07:00
Matej Bačo
b9cebae561
Fix activate param
2024-07-03 17:14:59 +02:00
Richard
b2468a60f0
Merge branch 'main' into update-functions-api
2024-07-03 09:05:31 -04:00
Richard
1539fc2b7c
Merge branch 'main' into update-acct-api-reference
2024-07-03 09:04:45 -04:00
Damodar Lohani
d2c5e55ca7
Merge pull request #8355 from appwrite/feat-scheduled-executions
...
Feat scheduled executions
2024-07-03 16:08:48 +05:45
Matej Bačo
b5fc9d5789
PR review changes
2024-07-03 09:35:56 +00:00
Matej Bačo
2262d516f1
Merge remote-tracking branch 'origin/1.6.x' into mock-numbers
2024-07-03 09:30:11 +00:00
Damodar Lohani
75cd558670
Merge pull request #8323 from appwrite/feat-opr-v4-support
...
OPR v4 support
2024-07-03 15:11:54 +05:45
Damodar Lohani
1c0490aa91
Merge pull request #8315 from appwrite/feat-new-session-alert
...
Feat new session alert
2024-07-03 14:58:16 +05:45
Matej Bačo
3a570b1f73
PR review changes
2024-07-03 08:27:54 +00:00
Matej Bačo
5fb41fd216
Fix executions
2024-07-03 08:00:17 +00:00
Matej Bačo
5ef196ec9a
PR review changes
2024-07-03 07:11:15 +00:00
Matej Bačo
1c83668568
PR review changes
2024-07-03 07:02:41 +00:00
Binyamin Yawitz
c7d030fef4
Merge branch 'feat-scheduled-executions' into feat-delete-execution
2024-07-02 16:21:20 -04:00
Binyamin Yawitz
deaec44264
Merge branch '1.6.x' into mock-numbers
2024-07-02 16:21:07 -04:00
Matej Bačo
cc176a4e7d
Merge remote-tracking branch 'origin/1.6.x' into feat-scheduled-executions
2024-07-02 15:56:54 +00:00
Khushboo Verma
e9034a9d9d
Fix missing closing bracket
2024-07-02 17:08:59 +05:30
Khushboo Verma
ead0b93900
Resolve merge conflict
2024-07-02 14:59:15 +05:30
Khushboo Verma
f72f9c7881
Merge branch '1.6.x' into feat-new-session-alert
2024-07-02 14:50:11 +05:30
choir27
dc07b5d028
docs: update functions api reference
2024-07-01 15:35:55 -04:00
Binyamin Yawitz
30db70fe80
fix: reviews
2024-07-01 10:23:39 -04:00
Khushboo Verma
f8427155f9
Merge branch '1.6.x' into mock-numbers
2024-07-01 17:02:41 +05:30
loks0n
bb3ee81065
chore: rename metadata to data
2024-06-28 22:42:55 +01:00
Khushboo Verma
66c761b73e
Create execution even when logging is disabled
2024-06-28 19:51:33 +05:30
Binyamin Yawitz
4e4fcc06fd
refactor: Project deletion in worker
2024-06-27 18:27:04 -04:00
Binyamin Yawitz
b19d7cb35f
feat: Update scheduled when deleting an execution
2024-06-27 18:12:23 -04:00
Binyamin Yawitz
3aee3122a9
Merge remote-tracking branch 'refs/remotes/origin/feat-scheduled-executions' into feat-delete-execution
2024-06-27 15:10:51 -04:00
Binyamin Yawitz
010f8d3fb8
review: Delete execution
2024-06-27 12:36:24 -04:00
Binyamin Yawitz
366d75fe39
feat: Delete execution
2024-06-27 11:17:14 -04:00
Khushboo Verma
0a335ed8ac
Add appwrite version
2024-06-27 18:13:15 +05:30
Binyamin Yawitz
184d76fc9e
Merge branch 'refs/heads/1.6.x' into feat-extract-team-deletion
2024-06-26 12:28:12 -04:00
loks0n
d0125398f1
fix: test
2024-06-26 15:46:12 +01:00
loks0n
e884009075
fix: test
2024-06-26 13:14:07 +01:00
Luke B. Silver
ecf761beab
Merge branch '1.6.x' into feat-new-session-alert
2024-06-26 12:44:49 +01:00
loks0n
d9434517dc
Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-scheduled-executions
2024-06-26 12:30:48 +01:00
loks0n
303ce498be
feat: allow custom path method body
2024-06-26 12:30:23 +01:00
Matej Bačo
186cef458b
Implemented vcs.getRepositoryContents()
2024-06-26 10:03:27 +00:00
loks0n
6353de6f10
chore: fix template
2024-06-26 09:42:01 +01:00
Steven Nguyen
636497304e
Merge branch '1.5.x' into chore-sync-1.5.x-into-main
2024-06-25 23:47:37 +00:00
Luke B. Silver
dab0a17082
Merge branch '1.6.x' into feat-scheduled-executions
2024-06-25 17:21:44 +01:00
Christy Jacob
7cec278d27
Merge branch '1.6.x' of https://github.com/appwrite/appwrite into mock-numbers
2024-06-25 15:17:22 +00:00
Christy Jacob
91fe8b7a8b
Merge pull request #8295 from appwrite/sync-with-main
...
Sync with main
2024-06-25 19:13:32 +04:00
Binyamin Yawitz
b849d82772
refactor: Singular
2024-06-25 09:18:17 -04:00
Khushboo Verma
0edbec4f44
OPR v4 support
2024-06-25 15:03:07 +05:30
loks0n
0d987045bf
chore: revert fmt
2024-06-25 08:46:51 +01:00
Steven Nguyen
13027fac5b
fix(users): update session secret to be longer
...
The create session endpoint created a 6 character secret which is too
short. This changes the secret to be 256 characters which is in line
with the secret for `account.createEmailPasswordSession()`.
2024-06-24 23:21:45 +00:00
Steven Nguyen
34b2e15243
fix(users): fix expire error when creating user session
...
Before this, the Create session API call would throw:
> Invalid document structure: Missing required attribute "expire"
This is because the `expire` attribute is required, but it was omitted
from the document. This PR ensures the `expire` attribute is set when
creating the session document.
2024-06-24 23:21:44 +00:00
loks0n
0ea2438069
fix: implementation
2024-06-24 14:12:09 +01:00
loks0n
fbeca34df8
fix: func
2024-06-24 10:34:06 +01:00
loks0n
f3f233eb14
feat: new session alert
2024-06-21 19:21:05 +01:00
choir27
6a406454ba
docs: update api reference
2024-06-21 10:41:46 -04:00
Christy Jacob
a2f27ec15f
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-main
2024-06-21 13:11:35 +00:00
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
fdf44c7bab
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main
2024-06-20 15:26:17 +00:00
Christy Jacob
c5fa7eb7dc
Merge branch '1.6.x' of github.com:appwrite/appwrite into mock-numbers
2024-06-20 20:53:06 +05:30
Christy Jacob
814b59a13a
Merge branch 'main' of github.com:appwrite/appwrite into mock-numbers
2024-06-20 20:42:29 +05:30
Christy Jacob
1b1cfc38c8
fix: undefined variable
2024-06-20 20:31:20 +05:30
Christy Jacob
392aaca681
chore: fix tests
2024-06-20 20:19:56 +05:30
Steven Nguyen
e3bc1887a4
Merge pull request #8263 from appwrite/docs-clarify-optional-url
...
docs: update text description in request table
2024-06-19 09:45:53 -07:00
Christy Jacob
c5e788c2ef
Merge pull request #7888 from appwrite/feat-security-emails
...
New environment for certificates and security emails
2024-06-19 12:20:55 +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
Richard
0dc553f31d
Merge branch 'main' into docs-clarify-optional-url
2024-06-18 09:12:32 -04:00
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
Binyamin Yawitz
6cfada946f
Merge branch '1.6.x' into feat-func-deploy-type
2024-06-17 13:53:21 -04:00
loks0n
2f0f7bf9c7
fix: test
2024-06-17 13:44:12 +01:00
Damodar Lohani
3dcd1314f5
fix file size multiplier
2024-06-17 04:50:22 +00:00
Christy Jacob
9e1541d96a
Merge branch 'main' of https://github.com/appwrite/appwrite into mock-numbers
2024-06-16 07:28:22 +00:00
Christy Jacob
a912bbe374
chore: update variable name
2024-06-16 07:19:10 +00:00
Luke B. Silver
9341c9d76b
Merge branch '1.6.x' into feat-scheduled-executions
2024-06-14 14:07:41 +01:00
choir27
84d9b4befe
docs: fix hyperlink in storage code snippet
2024-06-13 09:59:20 -04:00
loks0n
865b12ba9d
chore: exception type
2024-06-13 09:24:51 +01:00
choir27
897ae1c859
docs: update text description in request table
2024-06-12 10:47:48 -04:00
loks0n
0a78d41ecb
chore: remove endTime
2024-06-12 13:50:18 +01:00
loks0n
7559c9af68
chore: us spelling of canceled
2024-06-12 11:21:48 +01:00
Bishwajeet Parhi
190560b8ef
chore: append attributes instead of replace
2024-06-11 21:17:25 +05:30
loks0n
1269397475
chore: fmt
2024-06-11 15:50:50 +01:00
loks0n
853ffe804e
feat: improve duration calc
2024-06-11 15:48:55 +01:00
loks0n
67b32ecb05
test: cancel deployment
2024-06-11 15:41:13 +01:00
Bradley Schofield
d8b893c7c9
Small fixes
2024-06-11 14:52:21 +09:00
Bradley Schofield
83d093805f
Implement deploymentsStorage metric for projects API
2024-06-11 14:14:38 +09:00
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
Matej Bačo
b8b81a9bd1
WIP: Schedulded executions
2024-06-07 19:05:29 +00:00
Khushboo Verma
97786a05ff
Updated cancelled build duration
2024-06-07 20:29:24 +05:30
Khushboo Verma
d233f1ac64
Update duration and endTime
2024-06-07 16:53:33 +05:30
Khushboo Verma
c2c6d337ed
Resolved merge conflict
2024-06-06 19:39:16 +05:30
Christy Jacob
3e47b43908
Merge pull request #8214 from appwrite/chore-update-create-build-endpoint
...
Remove build id from api endpoint
2024-06-06 17:53:05 +05:30
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
Eldad A. Fux
f91a68c8a0
Merge pull request #8207 from appwrite/feat-users-create-jwt
...
Feat: users.createJWT()
2024-06-04 07:00:32 -04:00
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
Damodar Lohani
66ac96580b
Merge branch 'main' into feat-security-emails
2024-06-04 06:51:24 +05:45
Khushboo Verma
d7a40e2b4d
Remove the code to fetch build document
2024-06-02 23:14:41 +05:30
Khushboo Verma
0eabff5faf
Refactor builds document creation
2024-05-31 01:53:29 +05:30
Khushboo Verma
d3c2e9db1f
Add comment for clarity
2024-05-30 22:33:37 +05:30
Binyamin Yawitz
18ca583df8
feat: Deleting teams in sync
2024-05-29 15:52:22 -04:00
Binyamin Yawitz
ca7f222640
feat: Adding cli to the function deployment type
2024-05-29 12:55:14 -04:00
Khushboo Verma
94e7669b41
Remove build id from api endpoint
2024-05-29 17:48:52 +05:30
Bradley Schofield
d4db55ab77
Fix failed queue param in failed jobs
2024-05-29 18:11:58 +09:00
Matej Bačo
b0317fb19d
Implement project dynamic (JWT) keys
2024-05-29 08:57:25 +00:00
Matej Bačo
3b8799353d
PR review changes
2024-05-29 07:51:51 +00:00
Matej Bačo
2dac8bc7ed
Update app/controllers/api/users.php
...
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-05-29 09:31:08 +02:00
Matej Bačo
711e26c605
Relay on lib to verify JWT expiry
2024-05-28 10:59:53 +00:00
Matej Bačo
b1ff989c3f
Implement tests, fix JWT maxAge
2024-05-28 09:25:54 +00:00
Matej Bačo
613677e9f7
Implement users.createJWT
2024-05-27 20:04:50 +00:00
Khushboo Verma
b880a0a7b2
Remove :buildId from endpoint as discussed
2024-05-27 18:21:28 +05:30
Khushboo Verma
4e8855fad3
Merge branch '1.6.x' into feat-cancel-build-deployment
2024-05-27 18:03:59 +05:30
Matej Bačo
8dd883a312
Add comments
2024-05-24 13:04:30 +02:00
Jake Barnby
e19b465ce2
Move shared tables db to env var from const
2024-05-24 20:10:47 +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
Khushboo Verma
f0de4c6eac
Resolved merge conflict
2024-05-23 18:34:48 +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
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
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
Matej Bačo
a115f878b3
Merge remote-tracking branch 'origin/1.6.x' into feat-function-tokens
2024-05-21 10:28:21 +00: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
Matej Bačo
2e1f67245d
Fix bugs, add old api key test
2024-05-16 08:39:15 +00: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
Ketan Baitule
6ff3fc5c6b
fix: Allow Adding User Over Limit From Console In Team Membership
2024-05-15 15:03:46 +05:30
Matej Bačo
37176e7865
Backwards compatible approach
2024-05-14 12:33:49 +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
Matej Bačo
5002b0f3fa
PR review changes
2024-05-09 11:50:45 +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
Jake Barnby
f01922daf9
Fix syntax error
2024-05-08 21:06:30 +12:00
Jake Barnby
f7cd1e2361
Ensure namespace is set if override equals shared tables
2024-05-08 16:04:28 +12: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
912e3b01dc
Add clarifying comments
2024-05-07 14:07:04 +12: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
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
Matej Bačo
9a0d9cee15
Merge remote-tracking branch 'origin/main' into feat-function-tokens
2024-05-06 08:35:14 +00:00
Jake Barnby
52c52fa519
Add scheme to DSN on fail
2024-05-06 18:13:41 +12:00
Jake Barnby
db94070162
Use DSN for project database
2024-05-06 17:33:36 +12:00
Damodar Lohani
14a0dd3166
Merge remote-tracking branch 'origin/main' into feat-security-emails
2024-05-06 01:04:44 +00: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
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
Jake Barnby
c4deb0ba93
Allow shared tables namespace override
2024-05-03 21:30:38 +12:00
Jake Barnby
99d05b3d8c
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables
2024-05-03 14:24:57 +12: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
fba60f974e
Throw exception for cancellation if build is already complete
2024-04-30 15:46:58 +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
Khushboo Verma
ea9c71757c
Fix tests
2024-04-30 00:19:14 +05:30
Khushboo Verma
2b69f0b7e2
Fix formatting
2024-04-29 19:14:37 +05:30
Khushboo Verma
564fe96eec
Resolve merge conflicts
2024-04-29 19:05:51 +05:30
ItzNotABug
02ece2637f
fix: use resourceInternalId.
2024-04-29 15:54:22 +05:30
Matej Bačo
9616de7576
Merge branch 'main' into refactor-usage-sn-1.5.x
2024-04-26 13:11:21 +02: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
Damodar Lohani
fbdaf7616c
Fix response code label
2024-04-25 07:19:02 +05:45
shimon
4e639526d6
pull changes
2024-04-24 12:25:49 +03:00
Steven Nguyen
b75f5263a2
Merge branch 'main' into chore-sync-main-into-1.5.x
2024-04-23 23:43:53 +00:00
