1
0
Fork 0
mirror of synced 2024-07-06 23:21:05 +12:00
Commit graph

2567 commits

Author SHA1 Message Date
Jake Barnby 20de675bae
Poll for deployments instead of sleeping 2023-08-22 23:12:04 -04:00
Jake Barnby a1d62d8d42
Fix project test 2023-08-22 22:12:15 -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 24fcc360e2
GraphQL test fixes 2023-08-22 21:33:33 -04:00
Jake Barnby 6f775a2411
Review updates 2023-08-22 19:14: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
Jake Barnby 02f8e7796d
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters 2023-08-22 17:20:50 -04:00
Jake Barnby 9476c064c6
Fix test 2023-08-22 17:17:42 -04:00
Jake Barnby 0094ced967
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4.x-response-filters 2023-08-22 17:13:12 -04: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 360935fd28
Apply suggestions from code review 2023-08-22 14:13:37 -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 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
Jake Barnby c929fe113e
Fix colliding ID overrides 2023-08-22 13:11:32 -04: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 942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
Steven Nguyen a012a42008
Create 1.4 request filters 2023-08-21 11:52:03 -07:00
Steven Nguyen 0a0a5e9f04
Create 1.4 response filter 2023-08-21 11:48:48 -07:00
shimon 2b62149dda Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback 2023-08-21 10:37:44 +03:00
Jake Barnby a1b10ef7a8
Fix graphql tests 2023-08-20 13:40:44 -04:00
Jake Barnby 4c9c34d929
Fix console test 2023-08-20 13:21:14 -04:00
Jake Barnby 1e4a3cd020
Fix graphql test 2023-08-20 13:20:37 -04: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
Matej Bačo efe3793679 PR review changes, fix node test 2023-08-19 20:26:47 +02:00
Matej Bačo 5de7c24ee8 Fix more function tests 2023-08-19 13:37:45 +02:00
Matej Bačo 69cf0161ff Fix more tests 2023-08-19 10:05:49 +02:00
Jake Barnby 2404352f3c
Fix more graphql tests 2023-08-19 01:59:36 -04:00
Jake Barnby 0f98199c85
Fix webhook test 2023-08-18 14:21:54 -04:00
Jake Barnby 4f59570738
Fix storage tests 2023-08-18 14:20:29 -04:00
Jake Barnby e388f1f8e2
Remove redundant tests 2023-08-18 14:14:52 -04:00
Jake Barnby f18fb13afd
Fix graphql tests 2023-08-18 13:52:03 -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
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 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 6ef5e8bd7e
Fix test 2023-08-17 19:08:30 -04:00
Jake Barnby 49b9003b7f
FIx test 2023-08-17 17:58:04 -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 8de0eefbaa
Lint 2023-08-17 17:38:05 -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
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
prateek banga d6f4d76807 adds another scenario in test case 2023-08-16 14:57:50 +05:30
Matej Bačo 3a6f10fa62 Fix failing tests 2023-08-16 08:19:42 +02:00
Bishwajeet Parhi 42f1be0f6c
Update tests/e2e/Services/Teams/TeamsBaseServer.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-08-15 09:04:05 +05:30