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
Bradley Schofield
91c82f0d7d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-07 16:09:28 +01:00
Eldad A. Fux
04b8030a27
Merge pull request #5875 from appwrite/fix-aac-file-issue
...
audio/aac mime type added
2023-08-07 17:33:50 +03:00
Bradley Schofield
f27345fb92
Update SDK
2023-08-07 11:56:42 +01:00
prateek banga
9057a50a10
rename provider param in config
2023-08-07 15:54:00 +05:30
Eldad A. Fux
a56f91b054
Merge branch 'master' into feat-5542-validate-x-appwrite-id-header-for-CreateFile
2023-08-05 06:36:21 +03:00
Eldad A. Fux
702424ed31
Merge pull request #5694 from Miguelii/fix-5693-portuguese-email-template-missing-word
...
Added missing word to portuguese email template
2023-08-05 06:32:11 +03:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x
2023-08-04 18:07:33 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2
2023-08-04 13:55:07 -07:00
Bradley Schofield
84b159938e
Regenerate Specs
2023-08-04 17:23:42 +01:00