Jake Barnby
|
a848322687
|
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# 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.json
# composer.lock
|
2023-08-18 13:23:35 -04:00 |
|
Bradley Schofield
|
aa9ea0e013
|
Increment Version Number
|
2023-08-18 15:23:47 +01:00 |
|
Bradley Schofield
|
5c40f985f7
|
Run Linter
|
2023-08-18 11:19:51 +01:00 |
|
Bradley Schofield
|
0ebd6d43d5
|
Merge branch 'feat-git-integration' into feat-git-integration-migrations
|
2023-08-18 11:18:58 +01:00 |
|
Khushboo Verma
|
c1b7b6cd0d
|
Update limits
|
2023-08-18 12:44:13 +05:30 |
|
Khushboo Verma
|
76c3eb5c65
|
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
|
2023-08-18 12:26:11 +05:30 |
|
Khushboo Verma
|
00f6785818
|
Addressed PR comments
|
2023-08-18 12:25:44 +05:30 |
|
Jake Barnby
|
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 Barnby
|
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 |
|
Jake Barnby
|
3c3326260a
|
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
# composer.lock
|
2023-08-17 17:39:26 -04:00 |
|
Jake Barnby
|
07c985ebc3
|
Fix missing params from redeploy event
|
2023-08-17 17:37:52 -04:00 |
|
Bradley Schofield
|
e8056834aa
|
Run Formatter
|
2023-08-17 15:55:28 +01:00 |
|
Bradley Schofield
|
6577fc17a9
|
Remove ./vendor import and add missing envvars
|
2023-08-17 15:54:19 +01:00 |
|
Khushboo Verma
|
4285d99f08
|
Added exception for repo creation + small fixes
|
2023-08-17 19:24:57 +05:30 |
|
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 |
|
Bradley Schofield
|
7fedac9306
|
Handle Eldad Suggestions
|
2023-08-16 19:08:24 +01:00 |
|
Bradley Schofield
|
47b10fa82b
|
Implement IAM Custom Roles
|
2023-08-16 18:17:20 +01:00 |
|
Bradley Schofield
|
a0cd65b94b
|
Fix Migrations Stability
|
2023-08-16 16:01:56 +01:00 |
|
Matej Bačo
|
3a6f10fa62
|
Fix failing tests
|
2023-08-16 08:19:42 +02:00 |
|
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 |
|
Matej Bačo
|
ec82fec59f
|
Re-enable assistant
|
2023-08-12 21:08:44 +02:00 |
|
Matej Bačo
|
c24e2786fb
|
Even more PR review changes
|
2023-08-11 18:52:13 +02:00 |
|
Matej Bačo
|
f0125ac3bb
|
PR review changes
|
2023-08-11 18:44:05 +02:00 |
|
Bishwajeet Parhi
|
d00af693bb
|
fix duplicate locale code and tests passes
|
2023-08-11 21:29:13 +05:30 |
|
Matej Bačo
|
c6684ee7f8
|
PR review changes
|
2023-08-11 16:45:36 +02:00 |
|
Matej Bačo
|
897d299ae6
|
PR review changes, fixes from QA
|
2023-08-11 15:34:57 +02:00 |
|
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 |
|
Matej Bačo
|
1592533c98
|
Disable coroutine to fix DB issues
|
2023-08-11 12:02:06 +02:00 |
|
Matej Bačo
|
1bd96228bf
|
Fix file responses from router
|
2023-08-11 11:19:05 +02:00 |
|
Matej Bačo
|
5032fd7d08
|
Fix AI endpoints
|
2023-08-11 09:52:08 +02:00 |
|
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 |
|
Khushboo Verma
|
dfd686436a
|
Fix fetch commit details condition
|
2023-08-10 17:52:10 +05:30 |
|
prateek banga
|
8cefc54ca3
|
merge resolve conflicts
|
2023-08-10 17:22:15 +05:30 |
|
Matej Bačo
|
0111f25ef5
|
Update console
|
2023-08-10 03:01:24 +02:00 |
|
Matej Bačo
|
2a94dacdd1
|
Fix deployment issues from QA server
|
2023-08-10 02:31:49 +02:00 |
|