Matej Bačo
60d24e0072
Downgrade assistant
2023-08-20 11:42:17 +02:00
Matej Bačo
20a2d3755e
Add vars for Console
2023-08-20 10:10:42 +02:00
Matej Bačo
efe3793679
PR review changes, fix node test
2023-08-19 20:26:47 +02:00
Khushboo Verma
78a224be14
Fix deployment creation on branch creation
2023-08-19 18:24:43 +05:30
Khushboo Verma
3305e300b1
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-19 18:21:40 +05:30
Khushboo Verma
1284449765
Fixed GitHub comments
2023-08-19 18:21:27 +05:30
Matej Bačo
5de7c24ee8
Fix more function tests
2023-08-19 13:37:45 +02:00
Jake Barnby
9b2226b243
Fix manual and VCS redeploys
2023-08-19 02:15:47 -04:00
Jake Barnby
1e3fd5291e
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
2023-08-18 13:25:21 -04:00
Jake Barnby
a848322687
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# composer.json
# composer.lock
2023-08-18 13:23:35 -04:00
Bradley Schofield
0ebd6d43d5
Merge branch 'feat-git-integration' into feat-git-integration-migrations
2023-08-18 11:18:58 +01:00
Khushboo Verma
c1b7b6cd0d
Update limits
2023-08-18 12:44:13 +05:30
Khushboo Verma
76c3eb5c65
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-18 12:26:11 +05:30
Khushboo Verma
00f6785818
Addressed PR comments
2023-08-18 12:25:44 +05:30
Jake Barnby
a3895b041a
Apply suggestions from code review
2023-08-17 21:48:21 -04:00
Jake Barnby
a77ff0a9b0
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
2023-08-17 19:54:25 -04:00
Jake Barnby
a88f90dd90
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# composer.lock
2023-08-17 19:51:36 -04:00
Jake Barnby
92c39470be
Merge pull request #5800 from appwrite/fix-team-update-membership
...
Update method name for `updateMembershipRoles`
2023-08-17 19:43:56 -04:00
Jake Barnby
861ed521a0
Merge branch '1.4.x' into fix-team-update-membership
...
# Conflicts:
# app/config/specs/open-api3-1.4.x-client.json
# app/config/specs/open-api3-1.4.x-console.json
# app/config/specs/open-api3-1.4.x-server.json
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-1.4.x-client.json
# app/config/specs/swagger2-1.4.x-console.json
# app/config/specs/swagger2-1.4.x-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
2023-08-17 17:51:24 -04:00
Jake Barnby
3c3326260a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# composer.lock
2023-08-17 17:39:26 -04:00
Jake Barnby
07c985ebc3
Fix missing params from redeploy event
2023-08-17 17:37:52 -04:00
Bradley Schofield
e8056834aa
Run Formatter
2023-08-17 15:55:28 +01:00
Bradley Schofield
6577fc17a9
Remove ./vendor import and add missing envvars
2023-08-17 15:54:19 +01:00
Khushboo Verma
4285d99f08
Added exception for repo creation + small fixes
2023-08-17 19:24:57 +05:30
prateek banga
27df545fb7
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into fix-5404-update-document-without-relation-permission
2023-08-17 19:15:33 +05:30
prateek banga
860e9958c7
lint fix
2023-08-17 19:04:41 +05:30
Jake Barnby
414d85be8e
Update mode checks
2023-08-16 17:58:25 -04:00
Jake Barnby
b6ffb385a7
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
...
# Conflicts:
# tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-16 15:55:19 -04:00
Bradley Schofield
47b10fa82b
Implement IAM Custom Roles
2023-08-16 18:17:20 +01:00
Bradley Schofield
a0cd65b94b
Fix Migrations Stability
2023-08-16 16:01:56 +01:00
Matej Bačo
3a6f10fa62
Fix failing tests
2023-08-16 08:19:42 +02:00
Jake Barnby
8820d422be
Update app/controllers/api/databases.php
2023-08-14 20:45:05 -04:00
Jake Barnby
4ddb0ce6a7
Merge remote-tracking branch 'upstream/cl-1.4.x' into feat-add-encrypt-param
2023-08-14 19:37:37 -04:00
Jake Barnby
c00c5119b2
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
2023-08-14 19:33:56 -04:00
prateek banga
8e1ef812d3
resolve merge conflicts
2023-08-14 21:59:24 +05:30
Damodar Lohani
9d15f70db5
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-framework-router-v2
2023-08-13 00:45:11 +00:00
Matej Bačo
ec82fec59f
Re-enable assistant
2023-08-12 21:08:44 +02:00
Matej Bačo
c24e2786fb
Even more PR review changes
2023-08-11 18:52:13 +02:00
Matej Bačo
f0125ac3bb
PR review changes
2023-08-11 18:44:05 +02:00
Matej Bačo
897d299ae6
PR review changes, fixes from QA
2023-08-11 15:34:57 +02:00
prateek banga
971ebbc686
fix test cases
2023-08-11 16:17:31 +05:30
Matej Bačo
1bd96228bf
Fix file responses from router
2023-08-11 11:19:05 +02:00
Matej Bačo
5032fd7d08
Fix AI endpoints
2023-08-11 09:52:08 +02:00
Jake Barnby
16cb495a41
Lint
2023-08-10 21:31:31 -04:00
Jake Barnby
6cd0e328d9
Review fixes
2023-08-10 16:44:38 -04:00
Bishwajeet Parhi
d0755a587f
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
2023-08-10 22:31:53 +05:30
Khushboo Verma
dfd686436a
Fix fetch commit details condition
2023-08-10 17:52:10 +05:30
prateek banga
8cefc54ca3
merge resolve conflicts
2023-08-10 17:22:15 +05:30
Matej Bačo
2a94dacdd1
Fix deployment issues from QA server
2023-08-10 02:31:49 +02:00
Matej Bačo
b9c52d8583
QA after merge fix
2023-08-10 01:44:00 +02:00
Matej Bačo
899bc38069
Merge branch 'cl-1.4.x' into feat-git-integration
2023-08-10 01:12:09 +02:00
Matej Bačo
75e66e675b
Move oauth secret to identity
2023-08-10 01:02:13 +02:00
Bradley Schofield
d001f14249
Add Service Account Role Assignment
2023-08-09 23:46:23 +01:00
Matej Bačo
3ed4a65828
Fix VCS after lib upgrade
2023-08-09 23:00:04 +02:00
Matej Bačo
a2a50d066b
More deployment changes
2023-08-09 20:00:25 +02:00
Khushboo Verma
ced6eed6fa
Add urls in deployment details
2023-08-09 23:05:23 +05:30
Bradley Schofield
fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-09 18:08:40 +01:00
Bradley Schofield
0d58d20635
Update Migration Lib
2023-08-09 18:08:10 +01:00
Steven Nguyen
09254aeae0
Add description for the delete account identity's identityId param
2023-08-09 09:25:29 -07:00
Steven Nguyen
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-09 09:01:29 -07:00
Khushboo Verma
a63a668601
Add additional deployment info
2023-08-09 21:23:58 +05:30
Bradley Schofield
1135060681
Start work on identities implementation
2023-08-09 16:18:17 +01:00
Christy Jacob
7d60e4272d
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into feat-implement-migrations
2023-08-09 13:59:44 +00:00
Khushboo Verma
e267349a88
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-09 16:33:49 +05:30
Khushboo Verma
056b7120a6
Add additional information to deployments
2023-08-09 16:24:46 +05:30
Matej Bačo
9d0eda68d6
Upgrade after conflict
2023-08-09 12:35:04 +02:00
Matej Bačo
93735ac4a7
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
2023-08-09 12:30:45 +02:00
Matej Bačo
a60b54f434
Use identities table
2023-08-09 11:52:34 +02:00
Khushboo Verma
c6cdc0c37c
Fix broken functions flow
2023-08-09 13:16:17 +05:30
Eldad A. Fux
6ce3045f89
Merge pull request #5921 from appwrite/feat-user-identities-git-integration
...
Separate OAuth2 info from Sessions into Identities
2023-08-09 10:18:43 +03:00
Jake Barnby
d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param
2023-08-08 23:06:14 -04:00
prateek banga
4d03610755
resolve merge conflicts
2023-08-09 03:23:45 +05:30
Christy Jacob
c009a12a25
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x
2023-08-08 20:51:31 +00:00
Jake Barnby
b196914638
Fix console/API key checks
2023-08-08 15:46:01 -04:00
Bradley Schofield
47ebf77ff0
Continue work on OAuth Firebase last stage
2023-08-08 20:28:38 +01:00
prateek banga
51ceb5d74a
prohibit select queries in list attributes and remove static method
2023-08-09 00:12:53 +05:30
Christy Jacob
82a206d808
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data
2023-08-08 16:48:59 +00:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-08 08:34:01 -07:00
Bradley Schofield
f0477a7f2b
Move collections and update redirect sig
2023-08-08 14:36:44 +01:00
Matej Bačo
26aa37ccf0
Linter fix
2023-08-08 11:46:43 +02:00
Matej Bačo
2b96fb6c6f
Allow editing runtime
2023-08-08 11:28:25 +02:00
Bishwajeet Parhi
b3e962ba05
Merge branch 'master' into feat-whitelist-enums
2023-08-08 11:35:36 +05:30
Bishwajeet Parhi
2f3e14932a
fix: Tests
2023-08-08 11:34:02 +05:30
Bishwajeet Parhi
c3ebdc46e2
Merge branch 'master' into feat-add-encrypt-param
2023-08-08 11:04:28 +05:30
prateek banga
385f76d7f2
lint fix
2023-08-08 04:42:00 +05:30
prateek banga
60236b3af6
refactor according to review comments
2023-08-08 04:40:07 +05:30
prateek banga
7e185cd799
moved formatting logic to relationship attribute model
2023-08-08 03:34:13 +05:30
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration
2023-08-07 14:46:00 -07:00
prateek banga
52e800cc59
refactor according to review feedback
2023-08-08 02:56:20 +05:30
Khushboo Verma
d19769415f
Throw exception from createRepo
2023-08-07 21:09:51 +05:30
Matej Bačo
11068696c9
QA changes
2023-08-07 17:37:36 +02:00
Bradley Schofield
91c82f0d7d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-07 16:09:28 +01:00
prateek banga
0630f56dd5
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-query-support-attributes-indexes
2023-08-07 20:35:55 +05:30
Eldad A. Fux
90e89aa02e
Merge pull request #5934 from appwrite/feat-appwrite-assistant
...
Feat appwrite assistant
2023-08-07 17:56:22 +03:00
Eldad A. Fux
4b7cd5c372
Merge pull request #5715 from appwrite/fix-phone-abuse-param
...
fix: abuse label for creating phone session
2023-08-07 15:16:40 +03:00
Bradley Schofield
f27345fb92
Update SDK
2023-08-07 11:56:42 +01:00
Damodar Lohani
a6109a0341
Merge remote-tracking branch 'origin/1.4.x' into feat-framework-router-v2
2023-08-07 08:42:04 +00:00
Matej Bačo
d5fd3a28f9
More QA fixes
2023-08-06 15:11:30 +02:00
Matej Bačo
345df3f2ca
More QA fixes
2023-08-06 12:30:38 +02:00
Matej Bačo
e60456cfda
QA after merge with 1.4
2023-08-06 10:51:53 +02:00
Matej Bačo
906f86fbb8
Merge branch 'cloud-1.4.x' into feat-git-integration
2023-08-06 09:31:32 +02:00
Matej Bačo
eb63ec9b10
Support failure url on vcs
2023-08-05 20:53:42 +02:00
Matej Bačo
8a9f3f1b54
Update build to use 1 logs attribute
2023-08-05 16:50:28 +02:00
Eldad A. Fux
a56f91b054
Merge branch 'master' into feat-5542-validate-x-appwrite-id-header-for-CreateFile
2023-08-05 06:36:21 +03:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x
2023-08-04 18:07:33 -07:00
Steven Nguyen
cb7abdb906
Remove identity status
...
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
2023-08-04 15:07:36 -07:00
Steven Nguyen
bcd44432d1
Don't set password when oauth2 creates a user
...
Setting a password can cause problems with other APIs that expect the
password to be null. In addition, it doesn't match the implementation
for the other APIs that create a user without a password (Create Magic
URL Session, Create Phone Session, Create Anonymous Session, etc).
2023-08-04 15:07:36 -07:00
Steven Nguyen
27e212553d
Separate OAuth2 info from Sessions into Identities
...
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-04 15:07:36 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2
2023-08-04 13:55:07 -07:00
Bradley Schofield
8f5d79e668
Move to new branch
2023-08-04 17:21:41 +01:00
Bishwajeet Parhi
5f1a515f00
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
2023-08-04 19:20:44 +05:30
Damodar Lohani
767a3caef8
remove unused injection
2023-08-04 13:17:23 +00:00
Damodar Lohani
cd18853fed
add abuse labels
2023-08-04 13:16:57 +00:00
Damodar Lohani
64321cfb0b
remove authorization
2023-08-04 13:08:59 +00:00
Safwan Parkar
451f4bee19
Fixed an incorrect test for team deletion
...
This commit contains changes in 3 places.
- First I changed the placement of an informative comment in the DELETE TEAM controller, and moved it outside of the loop. I did this when Steven pointed out that the behaviour I describe in the comment is for the whole loop.
- The second change is the removal of my first test. I was facing quite a few issues with creating users in the test, and ended up using the CREATE TEAM MEMBERSHIP to perform 2 actions at once -> create a new user if one doesn't exist with the provided email, and create a membership for the user. Before this approach, I had quite a bit of code that didn't work, and it seems like I removed some things that weren't supposed to be removed, and didn't change variable names where necessary. Anyway, I figured that the problem has something to do with the user being created on the client side, so I moved the test to the server side.
- The new test I implemented does the same thing as my previous failed test, but in more detailed and distinct steps. The test first creates 5 new users inside of a loop, and pushes each new user's ID to an array called 'new_users' if the response is as expected. Then a new team is created. The next step is to create memberships for all 5 users. If all these steps pass, the new team that was just created, is deleted, and we check to make sure the new users have 0 team memberships each.
Formatter and linter showed no errors. Tests were successful on localhost.
2023-08-04 15:40:42 +04:00
Matej Bačo
8bc933ab91
Fix template issues
2023-08-04 10:56:46 +02:00
Damodar Lohani
49085be4e4
fix formatting
2023-08-04 02:17:02 +00:00
Damodar Lohani
45afea9175
moved assistant endpoint to console, and add env support
2023-08-04 01:42:22 +00:00
Safwan Parkar
d142620c5e
invalidate cached document of user
...
- cache caused stale data in memberships
2023-08-03 22:08:27 +04:00
Safwan Parkar
a14d89eb3c
remove error-causing condition
2023-08-03 21:39:18 +04:00
prateek banga
ea57a303d0
lint fixes
2023-08-03 17:39:13 +05:30
prateek banga
f797c2574a
resolve merge conflicts with 1.4.x
2023-08-03 17:38:22 +05:30
prateek banga
1d558fa5f5
Add select queries support to list indexes and list attributes endpoint
2023-08-03 17:34:28 +05:30
Damodar Lohani
2a7ec490af
setup appwrite assistant for test
2023-08-03 10:29:36 +00:00
prateek banga
f8ae04f3b9
resolve merge conflicts with 1.4.x branch
2023-08-03 15:25:48 +05:30
Steven Nguyen
b8e22151f6
Remove identity status
...
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
2023-08-02 15:37:22 -07:00
Steven Nguyen
b9c2b9322f
Don't set password when oauth2 creates a user
...
Setting a password can cause problems with other APIs that expect the
password to be null. In addition, it doesn't match the implementation
for the other APIs that create a user without a password (Create Magic
URL Session, Create Phone Session, Create Anonymous Session, etc).
2023-08-02 15:36:06 -07:00
Steven Nguyen
a235024268
Separate OAuth2 info from Sessions into Identities
...
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-02 15:36:06 -07:00
Safwan Parkar
2bc2061f09
fix showing of stale team memberships
2023-08-02 18:44:43 +04:00
Safwan Parkar
c5233d9ece
removed unnecessary code
2023-08-02 12:18:21 +04:00
Eldad A. Fux
05a316bf48
Merge pull request #5895 from appwrite/feat-2591-improve-oauth2-error-handling
...
Improve OAuth2 error handling
2023-08-01 22:55:58 +03:00
Safwan Parkar
a45c62ab24
run composer scripts
2023-08-01 23:24:46 +04:00
Safwan Parkar
0fe59d457b
fixed stale team memberships on user
2023-08-01 22:57:59 +04:00
prateek banga
40b0c081f7
remove checkPermission from Appwrite and more complex test case
...
This commit removes check pemission from update document in appwrite as permission is being checked by Utopia already. This commits also improves the test case to have 3 levels of depth with relationships
2023-08-01 23:29:15 +05:30
Khushboo Verma
5b9f71afe5
Add try-catch to listRepositories
2023-08-01 14:10:16 +05:30
Jake Barnby
ff83751450
Allow privileged user/app user/admin mode access to all resources when disabled
2023-07-31 14:24:21 -04:00
Steven Nguyen
eb7526601d
Delete duplicate 'Update Email Verification' endpoint
2023-07-31 11:00:30 -07:00
prateek banga
409376ef16
refactors checkPermission to throw exception when a change is found in updateDocument
2023-07-31 14:03:11 +05:30
Matej Bačo
ac2ca267d7
Address more PR reviews
2023-07-31 08:47:47 +02:00
Damodar Lohani
18407ce6ff
remove failing alias and alias tests
2023-07-31 05:53:27 +00:00
Matej Bačo
c7605b85e0
Remove vcs prefix
2023-07-30 21:10:25 +02:00
Matej Bačo
57a4d5ad66
Upgrade console, formatting
2023-07-30 15:30:30 +02:00
Matej Bačo
6cea5a12bb
Improve performance of listRepositores
2023-07-30 15:24:10 +02:00
Matej Bačo
280b2fc994
Rename repositories and installation IDs
2023-07-30 11:51:13 +02:00
Damodar Lohani
fa8fab184b
fix remove duplicate endpoints
2023-07-30 09:23:12 +00:00
Matej Bačo
96338954d2
Better runtime detection
2023-07-30 10:30:47 +02:00
Matej Bačo
a718f09f74
Update execution model, add detection to repository
2023-07-30 09:17:23 +02:00
Matej Bačo
2e177873c0
Update execution response model
2023-07-29 18:20:20 +02:00
Matej Bačo
22f638e6aa
rename vcsRepos to vcsRepositories
2023-07-29 18:04:43 +02:00
Matej Bačo
e6d1a3424f
Fix github state
2023-07-29 18:03:18 +02:00
