Commit Graph

8501 Commits

Author SHA1 Message Date
prateek banga cc1311b723 Merge branch 'feat-add-messaging-response-models' into feat-messages-event-config 2023-08-18 23:33:59 +05:30
prateek banga a174aca2c8 lint fix and rename subscriber model file correctly 2023-08-18 23:30:42 +05:30
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
Bradley Schofield bcfb0d1428 Fix Realtime 2023-08-18 11:11:24 +01:00
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 2d53c73e7a Remove extra line 2023-08-17 22:15:33 -04:00
Jake Barnby dbba62fe24 Remove permission index and _uid column type change migrations 2023-08-17 22:14:55 -04:00
Jake Barnby a3895b041a Apply suggestions from code review 2023-08-17 21:48:21 -04:00
Steven Nguyen ccd8c86e88 Skip updating _uid attribute and _permission index
These updates make use of the PDO to manually execute a SQL statement,
but the PDO is not available in the new migration platform task. So
that we can move forward with the release, we will skip these updates
and then figure it out in a subsequent release.
2023-08-17 17:17:13 -07:00
Steven Nguyen e8f5229756 Fix console db namespace 2023-08-17 17:17:13 -07:00
Steven Nguyen 436600547c Fix Migration task after it was converted to a Platform task 2023-08-17 17:17:12 -07:00
Steven Nguyen 586ad1984c Update 1.4 migration 2023-08-17 17:15:35 -07: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 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
Khushboo Verma 4285d99f08 Added exception for repo creation + small fixes 2023-08-17 19:24:57 +05:30
prateek banga 07b7a9db0f adds controller for creating a user target 2023-08-17 17:24:45 +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
prateek banga c7dec3762b Adds getTarget and list targets controller to user and account 2023-08-16 20:13:38 +05:30
prateek banga e2e4287801 resolve merge conflicts 2023-08-16 15:19:16 +05:30
prateek banga 45e03d3973 Merge branch 'feat-add-messaging-providers' into feat-add-messaging-response-models 2023-08-16 15:17:53 +05:30
prateek banga 92e587769a resolve merge conflicts 2023-08-16 15:16:45 +05:30
Jake Barnby 23deb5c4df Apply suggestions from code review 2023-08-14 21:57:48 -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 68601c5dc2 FIx lint 2023-08-14 19:35:18 -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 4b63a4abbb resolve merge conflicts 2023-08-14 21:13:47 +05:30
prateek banga 296a54d0ce adds messages event config and target attribute in user model 2023-08-14 21:11:24 +05:30
Bishwajeet Parhi 12a61feed4 chore: add PlatformType 2023-08-14 14:03:30 +05:30
Matej Bačo ec82fec59f Re-enable assistant 2023-08-12 21:08:44 +02:00
Jake Barnby efe81f5723 Merge branch 'cl-1.4.x' into v19-migration 2023-08-11 19:29:12 -04:00
Bishwajeet Parhi e691efde6c chore: vars naming changes 2023-08-11 22:50:40 +05:30
Bishwajeet Parhi 4e0250cc9f Update src/Appwrite/Specification/Format.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-08-11 22:46:48 +05:30
Bishwajeet Parhi 61a37a9a48 Update src/Appwrite/Specification/Format/OpenAPI3.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-08-11 22:46:24 +05:30
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
Jake Barnby 7cd995ac3c Apply suggestions from code review 2023-08-11 12:29:55 -04:00
Matej Bačo d219085196 More PR review changes 2023-08-11 17:17:32 +02:00
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
Bishwajeet Parhi 5c8618410b chore: implement blacklist and regenerate specs 2023-08-11 13:13:46 +05:30
Bishwajeet Parhi 528846c35e fix: missing Whitelist enums 2023-08-11 02:25:50 +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
prateek banga 233f4ebb56 lint fix 2023-08-10 20:03:47 +05:30
prateek banga 023e88ff56 removes condition 2023-08-10 20:00:13 +05:30
Matej Bačo 2a94dacdd1 Fix deployment issues from QA server 2023-08-10 02:31:49 +02:00
Matej Bačo 899bc38069 Merge branch 'cl-1.4.x' into feat-git-integration 2023-08-10 01:12:09 +02:00