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
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
04d0e284a1
Update specs
2023-08-14 22:29:47 -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
c00c5119b2
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
2023-08-14 19:33:56 -04:00
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
d00af693bb
fix duplicate locale code and tests passes
2023-08-11 21:29:13 +05:30
prateek banga
0304adf872
fix test cases
2023-08-11 16:19:05 +05:30
prateek banga
971ebbc686
fix test cases
2023-08-11 16:17:31 +05:30
Bishwajeet Parhi
5c8618410b
chore: implement blacklist and regenerate specs
2023-08-11 13:13:46 +05:30
Jake Barnby
16cb495a41
Lint
2023-08-10 21:31:31 -04:00
Bishwajeet Parhi
528846c35e
fix: missing Whitelist enums
2023-08-11 02:25:50 +05:30
Jake Barnby
6cd0e328d9
Review fixes
2023-08-10 16:44:38 -04:00
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
prateek banga
8cefc54ca3
merge resolve conflicts
2023-08-10 17:22:15 +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
f4ef252bf2
Update migrations.php
2023-08-09 23:47:51 +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
Bradley Schofield
0d58d20635
Update Migration Lib
2023-08-09 18:08:10 +01:00
Steven Nguyen
09254aeae0
Add description for the delete account identity's identityId param
2023-08-09 09:25:29 -07: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
prateek banga
4d03610755
resolve merge conflicts
2023-08-09 03:23:45 +05:30
Christy Jacob
5be55f05e8
feat: update error page
2023-08-08 21:25:48 +00: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
prateek banga
51ceb5d74a
prohibit select queries in list attributes and remove static method
2023-08-09 00:12:53 +05:30
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
Christy Jacob
5b42d2c21f
feat: review comments
2023-08-08 16:47:51 +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
Bishwajeet Parhi
2f3e14932a
fix: Tests
2023-08-08 11:34:02 +05:30
Bishwajeet Parhi
c3ebdc46e2
Merge branch 'master' into feat-add-encrypt-param
2023-08-08 11:04:28 +05:30
prateek banga
385f76d7f2
lint fix
2023-08-08 04:42:00 +05:30
prateek banga
60236b3af6
refactor according to review comments
2023-08-08 04:40:07 +05:30
prateek banga
7e185cd799
moved formatting logic to relationship attribute model
2023-08-08 03:34:13 +05:30
prateek banga
52e800cc59
refactor according to review feedback
2023-08-08 02:56:20 +05:30
Bradley Schofield
e28dd260c3
Update init.php
2023-08-07 16:17:34 +01:00