Commit Graph
5071 Commits
Author SHA1 Message Date
Vincent (Wen Yu) Ge 07a7a710ee Improve error and copy in params/models 2023-08-22 20:11:33 +00:00
Jake Barnby 87b72e4d0d Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4-request-response-filters 2023-08-22 16:01:19 -04:00
Jake Barnby c3682362e9 Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:44 -04:00
Jake Barnby c929fe113e Fix colliding ID overrides 2023-08-22 13:11:32 -04:00
prateek banga 78385a59c6 adds remaining provider controllers 2023-08-22 22:15:31 +05:30
Matej Bačo eea43e17bd Fix function request filter 2023-08-22 15:16:07 +02:00
Khushboo Verma 1b476eb774 Updated SDK 2023-08-22 18:05:51 +05:30
Vincent (Wen Yu) Ge 1ffd660334 Improve error copy 2023-08-22 04:15:15 +00:00
prateek banga a6d613542b adds messaging api controlle for mailgun provider 2023-08-21 16:14:50 +05:30
prateek banga 5e3065c30a merge resolve conflicts 2023-08-21 14:07:18 +05:30
shimon e86286e7e3 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
 Conflicts:
	composer.lock
2023-08-20 18:07:57 +03:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Matej Bačo 7bdbd51255 PR review changes 2023-08-20 14:14:05 +02:00
Matej Bačo 20a2d3755e Add vars for Console 2023-08-20 10:10:42 +02:00
Matej Bačo efe3793679 PR review changes, fix node test 2023-08-19 20:26:47 +02:00
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
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 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
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
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 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
Jake Barnby 04d0e284a1 Update specs 2023-08-14 22:29:47 -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
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 d00af693bb fix duplicate locale code and tests passes 2023-08-11 21:29:13 +05:30
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 cec9798126 push latest specs 2023-08-11 00:44:22 +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
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 c6302014f5 Run Linter 2023-08-09 23:51:36 +01:00
Bradley Schofield d001f14249 Add Service Account Role Assignment 2023-08-09 23:46:23 +01: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