6c67172fd7
Fix missing ID
2023-08-21 23:45:32 -04:00
942705b5f3
Fix database upgrade
2023-08-21 23:25:55 -04:00
1e3fd5291e
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
2023-08-18 13:25:21 -04:00
a3895b041a
Apply suggestions from code review
2023-08-17 21:48:21 -04:00
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
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
92c39470be
Merge pull request #5800 from appwrite/fix-team-update-membership
...
Update method name for `updateMembershipRoles`
2023-08-17 19:43:56 -04:00
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
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
860e9958c7
lint fix
2023-08-17 19:04:41 +05:30
414d85be8e
Update mode checks
2023-08-16 17:58:25 -04:00
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
04d0e284a1
Update specs
2023-08-14 22:29:47 -04:00
8820d422be
Update app/controllers/api/databases.php
2023-08-14 20:45:05 -04:00
4ddb0ce6a7
Merge remote-tracking branch 'upstream/cl-1.4.x' into feat-add-encrypt-param
2023-08-14 19:37:37 -04:00
c00c5119b2
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
2023-08-14 19:33:56 -04:00
8e1ef812d3
resolve merge conflicts
2023-08-14 21:59:24 +05:30
ac4701988a
generate api specs
2023-08-14 17:01:42 +05:30
d00af693bb
fix duplicate locale code and tests passes
2023-08-11 21:29:13 +05:30
0304adf872
fix test cases
2023-08-11 16:19:05 +05:30
971ebbc686
fix test cases
2023-08-11 16:17:31 +05:30
5c8618410b
chore: implement blacklist and regenerate specs
2023-08-11 13:13:46 +05:30
16cb495a41
Lint
2023-08-10 21:31:31 -04:00
528846c35e
fix: missing Whitelist enums
2023-08-11 02:25:50 +05:30
6cd0e328d9
Review fixes
2023-08-10 16:44:38 -04:00
cec9798126
push latest specs
2023-08-11 00:44:22 +05:30
d0755a587f
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
2023-08-10 22:31:53 +05:30
8cefc54ca3
merge resolve conflicts
2023-08-10 17:22:15 +05:30
75e66e675b
Move oauth secret to identity
2023-08-10 01:02:13 +02:00
c6302014f5
Run Linter
2023-08-09 23:51:36 +01:00
f4ef252bf2
Update migrations.php
2023-08-09 23:47:51 +01:00
d001f14249
Add Service Account Role Assignment
2023-08-09 23:46:23 +01:00
fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-09 18:08:40 +01:00
0d58d20635
Update Migration Lib
2023-08-09 18:08:10 +01:00
09254aeae0
Add description for the delete account identity's identityId param
2023-08-09 09:25:29 -07:00
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
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-09 09:01:29 -07:00
1135060681
Start work on identities implementation
2023-08-09 16:18:17 +01:00
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
d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param
2023-08-08 23:06:14 -04:00
4d03610755
resolve merge conflicts
2023-08-09 03:23:45 +05:30
5be55f05e8
feat: update error page
2023-08-08 21:25:48 +00:00
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
b196914638
Fix console/API key checks
2023-08-08 15:46:01 -04:00
47ebf77ff0
Continue work on OAuth Firebase last stage
2023-08-08 20:28:38 +01:00
51ceb5d74a
prohibit select queries in list attributes and remove static method
2023-08-09 00:12:53 +05:30
347cd4d13f
feat: generte specs
2023-08-08 16:58:06 +00:00
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
5b42d2c21f
feat: review comments
2023-08-08 16:47:51 +00:00
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-08 08:34:01 -07:00
Jake Barnby
prateek banga
Bishwajeet Parhi
Matej Bačo
Bradley Schofield
Steven Nguyen
Bradley Schofield
Christy Jacob