Commit Graph

18621 Commits

Author SHA1 Message Date
Steven Nguyen 586ad1984c Update 1.4 migration 2023-08-17 17:15:35 -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 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 6ef5e8bd7e Fix test 2023-08-17 19:08:30 -04:00
Jake Barnby 49b9003b7f FIx test 2023-08-17 17:58:04 -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 a019d01e91 Merge pull request #5887 from appwrite/fix-5404-update-document-without-relation-permission
Fix 5404 update document without relation permission
2023-08-17 17:48:08 -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 8de0eefbaa Lint 2023-08-17 17:38:05 -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 7fedac9306 Handle Eldad Suggestions 2023-08-16 19:08:24 +01:00
Bradley Schofield 8222e28ac9 Update FunctionsCustomServerTest.php 2023-08-16 18:40:24 +01:00
Bradley Schofield 616e61339c Update composer.json 2023-08-16 18:34:22 +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 d6f4d76807 adds another scenario in test case 2023-08-16 14:57:50 +05:30
Matej Bačo 3a6f10fa62 Fix failing tests 2023-08-16 08:19:42 +02:00
Eldad A. Fux 96fa7362f3 Merge pull request #5698 from appwrite/fix-cache-delete-bug-master
Fix cache delete bug master
2023-08-15 14:57:33 +03:00
Eldad A. Fux 279b482f1a Merge pull request #5726 from 2002Bishwajeet/feat-whitelist-enums
Feat:  Whitelist enums
2023-08-15 10:33:15 +03:00
Bishwajeet Parhi 42f1be0f6c Update tests/e2e/Services/Teams/TeamsBaseServer.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-08-15 09:04:05 +05:30
Jake Barnby 04d0e284a1 Update specs 2023-08-14 22:29:47 -04:00
Jake Barnby 23deb5c4df Apply suggestions from code review 2023-08-14 21:57:48 -04:00
Jake Barnby ff6d3f39b1 Remove invalid test 2023-08-14 20:47:47 -04:00
Jake Barnby 171f22daa0 Merge pull request #5604 from 2002Bishwajeet/feat-add-encrypt-param
feat: add encrypt param to string attribute
2023-08-14 20:45:15 -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 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
Jake Barnby 0ca90cee6c Fix test 2023-08-14 19:30:11 -04:00
prateek banga cb6760a957 removes unnecessary use statement 2023-08-14 22:02:54 +05:30
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
Bishwajeet Parhi 12a61feed4 chore: add PlatformType 2023-08-14 14:03:30 +05:30
Christy Jacob 06c0b189f0 feat: add version to dockerfile 2023-08-13 14:21:06 +00:00
Christy Jacob b0f5a0e677 feat: add version to dockerfile 2023-08-13 14:20:29 +00:00
Christy Jacob d9307724db feat: add missing variable to docker compose 2023-08-13 13:34:51 +00:00
Matej Bačo 01cb386566 Upgrade assistant 2023-08-13 10:28:34 +02:00
Damodar Lohani 7795933000 composer conflict fix 2023-08-13 00:46:23 +00:00
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
Christy Jacob 31191c0be8 chore: cleanup dockerfile 2023-08-11 23:49:10 +00:00