1
0
Fork 0
mirror of synced 2024-08-19 04:01:38 +12:00
Commit graph

3869 commits

Author SHA1 Message Date
Jake Barnby
c99288229f
Add back missing route 2023-08-22 21:36:32 -04:00
Jake Barnby
537756551e
Fix missing accessedAt 2023-08-22 21:36:04 -04:00
Jake Barnby
339893f4f1
Fix param order 2023-08-22 21:35:27 -04:00
Jake Barnby
43ba14fb75
Fix console tests 2023-08-22 21:35:00 -04:00
Jake Barnby
a84e669a1f
Add missing accessedAt values when creating users 2023-08-22 21:34:23 -04:00
Jake Barnby
efd25d6a70
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
# Conflicts:
#	app/controllers/api/users.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Storage/StorageBase.php
2023-08-22 17:58:42 -04:00
Vincent (Wen Yu) Ge
31b8c77b5c Fix typos, improve a few errors 2023-08-22 20:30:00 +00:00
Vincent (Wen Yu) Ge
07a7a710ee Improve error and copy in params/models 2023-08-22 20:11:33 +00:00
Jake Barnby
87b72e4d0d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4-request-response-filters 2023-08-22 16:01:19 -04:00
Jake Barnby
00dd77e930
Fix exception condition 2023-08-22 14:14:57 -04:00
Jake Barnby
c3682362e9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:44 -04:00
Jake Barnby
c929fe113e
Fix colliding ID overrides 2023-08-22 13:11:32 -04:00
Matej Bačo
eea43e17bd Fix function request filter 2023-08-22 15:16:07 +02:00
Matej Bačo
e345ef071a Allow custom deployment entrypoint 2023-08-22 11:47:10 +02:00
Matej Bačo
7c1a387a37 Improve commands quality 2023-08-22 10:16:17 +02:00
Jake Barnby
b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	app/controllers/api/functions.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
Vincent (Wen Yu) Ge
caf6bcae95 Remove mention of environment variables in docs 2023-08-22 04:16:41 +00:00
Jake Barnby
6c67172fd7
Fix missing ID 2023-08-21 23:45:32 -04:00
Jake Barnby
942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
Eldad A. Fux
8e46bdf7cb
Merge branch 'feat-git-integration' into feat-usage-rollback 2023-08-21 22:46:09 +03:00
Matej Bačo
fedac9592b Fix id null schedule bug 2023-08-21 19:43:03 +02:00
Matej Bačo
7c184498bb Fix GitHub app auth and migrations 2023-08-21 15:16:02 +02:00
Bradley Schofield
b7d053f60d
Update migrations.php 2023-08-21 13:42:02 +01:00
Khushboo Verma
d5968f3f2a Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-21 17:03:40 +05:30
shimon
1969ea9d16 rolling back usage flow 2023-08-21 13:50:45 +03:00
shimon
722a7ce8c9 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback 2023-08-21 13:50:34 +03:00
Bradley Schofield
9d88017e1f
Add Download Deployment Function 2023-08-21 11:21:18 +01:00
shimon
7ba42b0d6c rolling back usage flow 2023-08-21 11:53:00 +03:00
shimon
3cca907465 rolling back usage flow 2023-08-21 11:10:23 +03:00
shimon
99a43dec8c rolling back usage flow 2023-08-21 10:34:34 +03:00
shimon
f261ef8b70 rolling back usage flow 2023-08-21 10:31:12 +03:00
shimon
e86286e7e3 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
 Conflicts:
	composer.lock
2023-08-20 18:07:57 +03:00
shimon
83ffea68d1 rolling back usage flow 2023-08-20 16:53:26 +03:00
shimon
8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Khushboo Verma
e83f0f7b56 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-20 15:13:13 +05:30
Khushboo Verma
afbadf9322 Add search attribute to redeploy endpoint 2023-08-20 15:13:05 +05:30
Matej Bačo
60d24e0072 Downgrade assistant 2023-08-20 11:42:17 +02:00
Matej Bačo
20a2d3755e Add vars for Console 2023-08-20 10:10:42 +02:00
Matej Bačo
efe3793679 PR review changes, fix node test 2023-08-19 20:26:47 +02:00
Khushboo Verma
78a224be14 Fix deployment creation on branch creation 2023-08-19 18:24:43 +05:30
Khushboo Verma
3305e300b1 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-19 18:21:40 +05:30
Khushboo Verma
1284449765 Fixed GitHub comments 2023-08-19 18:21:27 +05:30
Matej Bačo
5de7c24ee8 Fix more function tests 2023-08-19 13:37:45 +02:00
Jake Barnby
9b2226b243
Fix manual and VCS redeploys 2023-08-19 02:15:47 -04:00
Jake Barnby
1e3fd5291e
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks 2023-08-18 13:25:21 -04:00
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
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
Jake Barnby
414d85be8e
Update mode checks 2023-08-16 17:58:25 -04:00
Jake Barnby
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
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
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
Damodar Lohani
9d15f70db5 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-framework-router-v2 2023-08-13 00:45:11 +00:00
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
Matej Bačo
897d299ae6 PR review changes, fixes from QA 2023-08-11 15:34:57 +02:00
prateek banga
971ebbc686 fix test cases 2023-08-11 16:17:31 +05:30
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
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
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
2a94dacdd1 Fix deployment issues from QA server 2023-08-10 02:31:49 +02:00
Matej Bačo
b9c52d8583 QA after merge fix 2023-08-10 01:44:00 +02:00
Matej Bačo
899bc38069 Merge branch 'cl-1.4.x' into feat-git-integration 2023-08-10 01:12:09 +02:00
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
Matej Bačo
3ed4a65828 Fix VCS after lib upgrade 2023-08-09 23:00:04 +02:00
Matej Bačo
a2a50d066b More deployment changes 2023-08-09 20:00:25 +02:00
Khushboo Verma
ced6eed6fa Add urls in deployment details 2023-08-09 23:05:23 +05:30
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
Khushboo Verma
a63a668601 Add additional deployment info 2023-08-09 21:23:58 +05:30
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
Khushboo Verma
e267349a88 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-09 16:33:49 +05:30