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
Bradley Schofield
7fedac9306
Handle Eldad Suggestions
2023-08-16 19:08:24 +01: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
04d0e284a1
Update specs
2023-08-14 22:29:47 -04: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
Bishwajeet Parhi
ac4701988a
generate api specs
2023-08-14 17:01:42 +05:30
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
Bishwajeet Parhi
d00af693bb
fix duplicate locale code and tests passes
2023-08-11 21:29:13 +05:30
Matej Bačo
c6684ee7f8
PR review changes
2023-08-11 16:45:36 +02:00
Matej Bačo
897d299ae6
PR review changes, fixes from QA
2023-08-11 15:34:57 +02:00
prateek banga
0304adf872
fix test cases
2023-08-11 16:19:05 +05:30
prateek banga
971ebbc686
fix test cases
2023-08-11 16:17:31 +05:30
Matej Bačo
1592533c98
Disable coroutine to fix DB issues
2023-08-11 12:02:06 +02:00
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
Bishwajeet Parhi
5c8618410b
chore: implement blacklist and regenerate specs
2023-08-11 13:13:46 +05:30
Jake Barnby
16cb495a41
Lint
2023-08-10 21:31:31 -04:00
Bishwajeet Parhi
528846c35e
fix: missing Whitelist enums
2023-08-11 02:25:50 +05:30
Jake Barnby
6cd0e328d9
Review fixes
2023-08-10 16:44:38 -04:00
Bishwajeet Parhi
cec9798126
push latest specs
2023-08-11 00:44:22 +05:30
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
0111f25ef5
Update console
2023-08-10 03:01:24 +02:00
Matej Bačo
2a94dacdd1
Fix deployment issues from QA server
2023-08-10 02:31:49 +02:00
Matej Bačo
659b2d7504
Update console
2023-08-10 01:54:06 +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
c6302014f5
Run Linter
2023-08-09 23:51:36 +01:00
Bradley Schofield
f4ef252bf2
Update migrations.php
2023-08-09 23:47:51 +01: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
c7c546bfe7
Add a secrets attribute to the identities collection
...
These secrets can be used to store data from the provider that may or
may not be sensitive.
For example, this will be used by the migration API when connecting to
Firebase to store the service account used for the migration.
This data will only be used internally inside Appwrite and not exposed
to an end user or developer.
2023-08-09 09:01:51 -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
2856077c04
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-09 21:24:24 +05:30
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
Steven Nguyen
14b84ed9e6
Add a secrets attribute to the identities collection
...
These secrets can be used to store data from the provider that may or
may not be sensitive.
For example, this will be used by the migration API when connecting to
Firebase to store the service account used for the migration.
This data will only be used internally inside Appwrite and not exposed
to an end user or developer.
2023-08-09 08:15:44 -07: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
18cf10139d
Asset names
2023-08-09 18:40:28 +05:30
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
ebeda626cd
Update console
2023-08-09 11:53:17 +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
5be55f05e8
feat: update error page
2023-08-08 21:25:48 +00:00
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
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
347cd4d13f
feat: generte specs
2023-08-08 16:58:06 +00:00
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
Christy Jacob
5b42d2c21f
feat: review comments
2023-08-08 16:47:51 +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
Bradley Schofield
f4cbcb1383
Re-Add collections
2023-08-08 13:45:33 +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
e28dd260c3
Update init.php
2023-08-07 16:17:34 +01: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
88e1deefb5
Merge pull request #5929 from appwrite/feat-sync-1.4-with-master
...
Sync with master
2023-08-07 17:57:43 +03:00
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
04b8030a27
Merge pull request #5875 from appwrite/fix-aac-file-issue
...
audio/aac mime type added
2023-08-07 17:33:50 +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