Commit Graph

25060 Commits

Author SHA1 Message Date
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 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 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
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
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
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
Christy Jacob 96354098f1 chore: cleanup dockerfile 2023-08-11 23:45:05 +00:00
Christy Jacob 8368ff0ffe chore: cleanup dockerfile 2023-08-11 23:43:55 +00:00
Jake Barnby 03cdae245e Merge pull request #5923 from appwrite/v19-migration
V19 migration - uid varchar
2023-08-11 19:30:17 -04:00
Jake Barnby efe81f5723 Merge branch 'cl-1.4.x' into v19-migration 2023-08-11 19:29:12 -04:00
Jake Barnby 6b915bad94 Merge pull request #5885 from appwrite/feat-query-support-attributes-indexes
Feat query support  in list attributes &  list indexes endpoint
2023-08-11 14:34:01 -04:00