Commit Graph
16599 Commits
Author SHA1 Message Date
Khushboo Verma 00f6785818 Addressed PR comments 2023-08-18 12:25:44 +05:30
Jake BarnbyandGitHub a3895b041a Apply suggestions from code review 2023-08-17 21:48:21 -04:00
Steven Nguyen e8f5229756 Fix console db namespace 2023-08-17 17:17:13 -07:00
Steven Nguyen 9f6b27f828 Uncomment new db env vars 2023-08-17 17:17:13 -07:00
Steven Nguyen 22780b87dc Bump appwrite version to 1.4.0 2023-08-17 17:10:14 -07: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 BarnbyandGitHub 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
prateek banga f73b3bf272 deletes user cache document 2023-08-18 01:07:42 +05:30
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
prateek banga c83e4db23d lint fix 2023-08-17 19:02:07 +05:30
prateek banga 07b7a9db0f adds controller for creating a user target 2023-08-17 17:24:45 +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 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 455176d077 Merge branch 'feat-add-messaging-collections-in-config' into feat-target-controllers-account-user 2023-08-16 20:29:19 +05:30
prateek banga 40f419663c removes id attribute from collections config 2023-08-16 20:28:40 +05:30
prateek banga e53f189b3b lint fix 2023-08-16 20:17:36 +05:30
prateek banga c7dec3762b Adds getTarget and list targets controller to user and account 2023-08-16 20:13:38 +05:30
prateek banga ab655e69e6 Merge branch 'feat-add-messaging-collections-in-config' into feat-messages-event-config 2023-08-16 18:49:00 +05:30
prateek banga 9fc75e5535 moves messaging collection to common, adds subqueryTargets 2023-08-16 18:48:38 +05:30
prateek banga 37e5cecfb1 resolve merge conflicts 2023-08-16 18:35:15 +05:30
prateek banga caad1a07d9 resolve merge conflicts 2023-08-16 18:21:04 +05:30
prateek banga e2e4287801 resolve merge conflicts 2023-08-16 15:19:16 +05:30
prateek banga 92e587769a resolve merge conflicts 2023-08-16 15:16:45 +05:30
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 BarnbyandGitHub 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
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 ac4701988a generate api specs 2023-08-14 17:01:42 +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
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