  Jake BarnbyandGitHub
|
a3895b041a
|
Apply suggestions from code review
|
2023-08-17 21:48:21 -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 BarnbyandGitHub
|
92c39470be
|
Merge pull request #5800 from appwrite/fix-team-update-membership
Update method name for `updateMembershipRoles`
|
2023-08-17 19:43:56 -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
|
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 BarnbyandGitHub
|
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 |
|
|
prateek banga
|
971ebbc686
|
fix test cases
|
2023-08-11 16:17:31 +05:30 |
|
|
Jake Barnby
|
16cb495a41
|
Lint
|
2023-08-10 21:31:31 -04:00 |
|
|
Jake Barnby
|
6cd0e328d9
|
Review fixes
|
2023-08-10 16:44:38 -04:00 |
|
 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
|
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
|
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 BarnbyandGitHub
|
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
|
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
|
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 |
|
|
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
|
91c82f0d7d
|
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
|
2023-08-07 16:09:28 +01:00 |
|
|
prateek banga
|
0630f56dd5
|
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-query-support-attributes-indexes
|
2023-08-07 20:35:55 +05:30 |
|
 Eldad A. FuxandGitHub
|
90e89aa02e
|
Merge pull request #5934 from appwrite/feat-appwrite-assistant
Feat appwrite assistant
|
2023-08-07 17:56:22 +03:00 |
|
|
Eldad A. FuxandGitHub
|
4b7cd5c372
|
Merge pull request #5715 from appwrite/fix-phone-abuse-param
fix: abuse label for creating phone session
|
2023-08-07 15:16:40 +03:00 |
|
|
Bradley Schofield
|
f27345fb92
|
Update SDK
|
2023-08-07 11:56:42 +01:00 |
|
|
Eldad A. FuxandGitHub
|
a56f91b054
|
Merge branch 'master' into feat-5542-validate-x-appwrite-id-header-for-CreateFile
|
2023-08-05 06:36:21 +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
|
8f5d79e668
|
Move to new branch
|
2023-08-04 17:21:41 +01:00 |
|
|
Bishwajeet Parhi
|
5f1a515f00
|
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
|
2023-08-04 19:20:44 +05:30 |
|
 Damodar Lohani
|
767a3caef8
|
remove unused injection
|
2023-08-04 13:17:23 +00:00 |
|