1
0
Fork 0
mirror of synced 2024-07-15 19:36:08 +12:00
Commit graph

4675 commits

Author SHA1 Message Date
Jake Barnby 360935fd28
Apply suggestions from code review 2023-08-22 14:13:37 -04:00
Jake Barnby e7d5d25263
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4.x-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:03 -04:00
Matej Bačo 4a2f10f938 Fix request host missing 2023-08-22 19:28:37 +02:00
Matej Bačo ee06ecf5c5 Linter 2023-08-22 15:18:07 +02:00
Matej Bačo ce54c71e16 Fix 404 pages 2023-08-22 12:23:49 +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
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
Steven Nguyen 0a0a5e9f04
Create 1.4 response filter 2023-08-21 11:48:48 -07: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
Khushboo Verma 4a80b08f4b Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-20 22:54:44 +05:30
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
Matej Bačo 7bdbd51255 PR review changes 2023-08-20 14:14:05 +02: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