1
0
Fork 0
mirror of synced 2024-09-09 22:27:06 +12:00
Commit graph

2710 commits

Author SHA1 Message Date
prateek banga
df77f92860 adds sub query for targets and topics, permission for user target 2023-08-25 01:22:16 +05:30
prateek banga
5ca8dc0a73 merge cl-1.4.x 2023-08-24 14:10:26 +05:30
prateek banga
ec54000263 adds test for target controllers 2023-08-24 01:54:25 +05:30
prateek banga
ac33d7828f Revert "Pint linter ran"
This reverts commit bf5f0a8419.
2023-08-24 01:53:52 +05:30
wess
bf5f0a8419 Pint linter ran 2023-08-23 13:12:43 -04:00
prateek banga
c225563d77 adds test for provider controllers 2023-08-23 15:31:29 +05:30
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
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
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
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
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
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
Bradley Schofield
fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-09 18:08:40 +01:00
Steven Nguyen
c7c546bfe7
Add a secrets attribute to the identities collection
These secrets can be used to store data from the provider that may or
may not be sensitive.

For example, this will be used by the migration API when connecting to
Firebase to store the service account used for the migration.

This data will only be used internally inside Appwrite and not exposed
to an end user or developer.
2023-08-09 09:01:51 -07:00
Steven Nguyen
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-09 09:01:29 -07:00
Bradley Schofield
1135060681
Start work on identities implementation 2023-08-09 16:18:17 +01:00
Christy Jacob
7d60e4272d Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into feat-implement-migrations 2023-08-09 13:59:44 +00:00
Jake Barnby
d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param 2023-08-08 23:06:14 -04:00
Christy Jacob
c009a12a25 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x 2023-08-08 20:51:31 +00:00
Bradley Schofield
47ebf77ff0 Continue work on OAuth Firebase last stage 2023-08-08 20:28:38 +01:00
Christy Jacob
347cd4d13f feat: generte specs 2023-08-08 16:58:06 +00:00
Christy Jacob
82a206d808 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-08-08 16:48:59 +00:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-08 08:34:01 -07:00
Bradley Schofield
f0477a7f2b Move collections and update redirect sig 2023-08-08 14:36:44 +01:00
Bradley Schofield
f4cbcb1383 Re-Add collections 2023-08-08 13:45:33 +01:00
Bishwajeet Parhi
b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30