Commit Graph

4120 Commits

Author SHA1 Message Date
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