Commit graph

781 commits

Author SHA1 Message Date
Bradley Schofield
116ba6bc7b
Fix Problems with tests and params 2024-12-03 04:38:59 +00:00
Jake Barnby
257733aec0
Update app/controllers/api/databases.php 2024-12-03 17:35:46 +13:00
Bradley Schofield
fbbf846eb9 Run Linter 2024-12-02 19:59:48 +09:00
Bradley Schofield
f061f724e0 Fix params 2024-12-02 19:06:34 +09:00
Bradley Schofield
3c418c1607 Address params and events 2024-12-02 18:08:10 +09:00
Bradley Schofield
8f8c008e8b Fix params and usage 2024-12-02 18:06:04 +09:00
Bradley Schofield
84ba7febe7 Run Linter 2024-12-02 16:45:03 +09:00
Bradley Schofield
32c4debffc Remove realtime/events from bulk operations and get usage events working 2024-12-02 16:40:19 +09:00
Bradley Schofield
2850879428 Remove Events for bulk updates 2024-12-02 16:07:32 +09:00
Bradley Schofield
00e3fe12f4 Revert "Fix wrong params on feedback, disable debugging in compose file"
This reverts commit 5c895579ed.
2024-11-28 17:25:38 +09:00
Bradley Schofield
5c895579ed Fix wrong params on feedback, disable debugging in compose file 2024-11-28 17:24:53 +09:00
Bradley Schofield
104a9b6074 Remove realtime support for bulk operations 2024-11-28 16:29:22 +09:00
fogelito
98864b04e1 fix $options 2024-11-27 18:02:37 +02:00
Bradley Schofield
2b08db9a38 Address Comments 2024-11-25 16:22:02 +09:00
Bradley Schofield
9d652d9e79 Remove double realtime 2024-11-25 16:08:50 +09:00
Bradley Schofield
2e60698ec1 Fix double event execution on document creation 2024-11-25 15:21:56 +09:00
Bradley Schofield
e1230f7465 Address Comments 2024-11-25 14:45:21 +09:00
Bradley Schofield
4e5ad33d73
Update app/controllers/api/databases.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-11-25 14:29:51 +09:00
Bradley Schofield
54260b5a9a Use new API Spec and get realtime/events working 2024-11-22 11:51:17 +09:00
Bradley Schofield
67b95c4b39 Update API Signature to DB Lib and get realtime/events working 2024-11-22 11:07:05 +09:00
Bradley Schofield
90c4bad826 Run Linter 2024-11-22 10:44:19 +09:00
Bradley Schofield
791f0dda79 Update to use new DB Lib and get realtime working 2024-11-22 10:43:45 +09:00
Christy Jacob
f490d4edaf
Merge pull request #8797 from appwrite/feat-migration
Feat migration
# Conflicts:
#	composer.lock
2024-11-21 14:08:20 +13:00
Bradley Schofield
79c043ec1f Fix Tests 2024-11-19 11:47:23 +09:00
Bradley Schofield
755e86020f Continue work on getting events working 2024-11-19 10:09:55 +09:00
Bradley Schofield
96e69b55e1 Add tests that are currently failing because of realtime and attempt to fix them 2024-11-15 12:00:11 +09:00
fogelito
abf97e391e formatting 2024-11-14 14:19:33 +02:00
fogelito
d8799e5a9c Remove comment 2024-11-14 14:13:28 +02:00
fogelito
217e471a41 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into unset-index-length 2024-11-14 14:12:03 +02:00
fogelito
72e491ac69 Remove unsetting index length for strings 2024-11-14 14:11:36 +02:00
Bradley Schofield
c210b2b874 Address Comments 2024-11-14 17:16:39 +09:00
Bradley Schofield
c0ef832784 Try and fix events 2024-11-14 17:15:28 +09:00
fogelito
68e96e9851 comment 2024-11-13 18:32:20 +02:00
fogelito
71f2c6c131 Remove purgeCachedCollection 2024-11-13 14:55:56 +02:00
Bradley Schofield
dd6bd745df Address Comments, fix permission bug 2024-11-13 13:41:18 +09:00
Bradley Schofield
a8f3b63ded Add Tests for Relationships and Permissions, Update error messages to be a little clearer 2024-11-13 10:00:40 +09:00
Bradley Schofield
172d25d67c Address Comments 2024-11-12 15:43:36 +09:00
Bradley Schofield
92c93357cf Address Jake's Comments 2024-11-12 11:41:08 +09:00
Bradley Schofield
6faad29907 Initial Version 2024-11-12 10:20:46 +09:00
fogelito
bae6e465fa updateAttributes 2024-11-11 18:46:47 +02:00
Bradley Schofield
44234da995 Implement Bulk Updates API 2024-11-11 15:27:26 +09:00
Christy Jacob
b1a1ad618a
Revert "Update database" 2024-11-09 01:01:14 +04:00
Jake Barnby
14532acb37
Update limit errors 2024-11-08 21:43:25 +13:00
Bradley Schofield
5bf20289a5 Address Comments 2024-11-08 16:17:29 +09:00
Bradley Schofield
313adc7023 Merge branch '1.6.x' into feat-bulk-deletes
# Conflicts:
#	composer.json
#	composer.lock
2024-11-07 12:37:08 +09:00
Bradley Schofield
86053e9028 Implement Bulk Deletes API 2024-11-07 12:30:17 +09:00
fogelito
46af6dc3f0 Fix permissions 2024-11-06 09:36:27 +02:00
Jake Barnby
4489d5f77f
Fix validator 2024-11-04 22:13:38 +13:00
Jake Barnby
a00671fe29
Lint 2024-11-04 21:53:00 +13:00
Jake Barnby
6bba134650
Set min/max for datetime validator 2024-11-04 21:50:22 +13:00
Jake Barnby
b6287e11a3
Add storage catches 2024-11-04 21:40:02 +13:00
Jake Barnby
c59cd97eb8
Not found exception 2024-11-04 20:57:08 +13:00
Jake Barnby
f9813b86ac
Merge pull request #8890 from appwrite/fix-update-size-validator
Fix validator usage for updating string size
2024-11-04 14:59:09 +13:00
Fabian Gruber
fed9cdb408 use resource type constants 2024-10-29 16:10:57 +01:00
Jake Barnby
eacb55cdcc
Fix validator usage for updating string size 2024-10-29 19:04:37 +13:00
Fabian Gruber
225e2c21c3 feat: allow blocking based on resource attributes 2024-10-24 11:26:25 +02:00
Jake Barnby
b32cb30737
Force CI 2024-10-17 18:51:41 +13:00
Jake Barnby
ea2192a83c
Force CI 2024-10-17 18:51:26 +13:00
Jake Barnby
a7f1cc128a
Validate cursor queries to avoid getDocument type error 2024-10-17 18:41:24 +13:00
Jake Barnby
f6658c4f5a
Merge remote-tracking branch 'origin/1.6.x' into check-cursor-value 2024-10-17 18:32:11 +13:00
shimon
424f24af04 remove resource 2024-10-06 21:02:24 +03:00
shimon
a7c0ef3d09 remove audits deletion 2024-10-06 20:22:25 +03:00
fogelito
b1cfd1c0ff Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups
# Conflicts:
#	app/controllers/api/databases.php
#	composer.lock
2024-09-26 10:42:15 +03:00
Bradley Schofield
f9d0f8fc38 Run Linter 2024-09-23 18:16:18 +09:00
Bradley Schofield
a309f31a33 Add tests, move hooks to API Layer 2024-09-23 18:08:48 +09:00
fogelito
b519f5e23a Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/ScheduleBase.php
#	src/Appwrite/Specification/Format/Swagger2.php
2024-09-19 18:19:45 +03:00
Bradley Schofield
82687c8ca4 Merge branch 'main' into 1.5.x-db-storage-metrics
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/swagger2-latest-console.json
#	app/controllers/api/project.php
#	src/Appwrite/Utopia/Response/Model/UsageProject.php
#	tests/e2e/General/UsageTest.php
2024-09-19 15:37:27 +09:00
Jake Barnby
af7bd705f4
Update console SDK version 2024-09-09 19:17:47 +12:00
Jake Barnby
3f99f01953
Recreate original on create failure with new key 2024-09-05 20:41:50 +12:00
Jake Barnby
a28f19ff3c
Merge fix 2024-09-05 16:16:28 +12:00
Jake Barnby
57c5925526
Wrap attribute recreate in transaction 2024-09-05 15:45:28 +12:00
Jake Barnby
d39729d830
Param reorder 2024-09-05 15:45:13 +12:00
Jake Barnby
24746de9ba
Merge remote-tracking branch 'origin/1.6.1' into feat-renaming-attributes
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/databases.php
2024-09-05 15:31:04 +12:00
Bradley Schofield
5820787afc Run Linter 2024-08-30 19:21:26 +09:00
Bradley Schofield
627cbe285f Address Comments 2024-08-30 19:18:45 +09:00
Bradley Schofield
40b1c28db0 Implement String Attribute Resizing 2024-08-30 18:22:17 +09:00
fogelito
5f27d75c11 Address comments 2024-08-22 17:30:50 +03:00
fogelito
ff1a679c49 Merge branch 'main' of https://github.com/appwrite/appwrite into migrations-backups-v2
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Migrations.php
#	tests/e2e/Services/Databases/DatabasesBase.php
2024-08-20 16:36:54 +03:00
Bradley Schofield
8770638d71 Implement Renaming Attributes in the API 2024-08-16 15:18:52 +09:00
fogelito
8de8ae03f3 Add header x-appwrite-preserve-dates 2024-07-22 15:38:58 +03:00
Bradley Schofield
f39d654725 Implement Trickle Down calculations 2024-07-18 13:58:02 +09:00
Binyamin Yawitz
0988fd7581
improve: events data 2024-07-11 11:03:28 -04:00
fogelito
475e2a64ce DuplicateException dbg 2024-07-11 13:36:28 +03:00
fogelito
865bfdbd34 DuplicateException dbg 2024-07-11 12:38:55 +03:00
fogelito
b4ab1c2c69 Debug create document 2024-07-10 16:34:05 +03:00
Jake Barnby
ed1a5b600d
Fix oldAttribute key length 2024-07-10 19:00:10 +12:00
fogelito
661329b977 Invalid cursor value 2024-05-09 19:54:28 +03:00
Matej Bačo
d091b37a15 Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x 2024-04-02 18:42:17 +02:00
Jake Barnby
22b3ea7e8d
Catch auth fixes 2024-03-11 13:03:30 +01:00
Jake Barnby
cea4e0d8b6
Wrap all db exceptions in error handler 2024-03-11 12:54:42 +01:00
Torsten Dittmann
0a1d572c72 chore: run formatter 2024-03-06 18:34:21 +01:00
Christy Jacob
03d6eb7401
Merge pull request #7669 from appwrite/main
Sync main
2024-02-26 17:39:33 +05:30
Jake Barnby
44ec1502f0
Merge remote-tracking branch 'origin/main' into 1.5.x 2024-02-26 18:35:25 +13:00
Jake Barnby
36ebb89a9b
Merge pull request #7667 from appwrite/1.5.x-api-descriptions
1.5.x api descriptions
2024-02-26 17:47:39 +13:00
Jake Barnby
19d7e533fa
Usage desc updates 2024-02-26 15:44:20 +13:00
Jake Barnby
00c3bc0f8a
Remove invalid index type 2024-02-26 15:38:58 +13:00
Vincent (Wen Yu) Ge
b32d40f3e2 Improve messages 2024-02-26 02:25:45 +00:00
fogelito
03ce64d41a Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2
 Conflicts:
	composer.lock
2024-02-25 11:01:08 +02:00
fogelito
1474bd65b0 Rename $collectionDocument 2024-02-25 10:57:41 +02:00
fogelito
af34f195c6 Address comments 2024-02-25 10:26:02 +02:00
Utkarsh Ahuja
8c4473932f fix: list api select query 2024-02-24 10:55:33 +00:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
fogelito
b9000e6d2f Changes message like Utopia 2024-02-13 12:29:36 +02:00
fogelito
99fed365db Update comment 2024-02-13 12:05:47 +02:00
fogelito
796e44a1ed Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2 2024-02-13 11:46:33 +02:00
Bradley Schofield
b60c591f8f Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-13 09:45:59 +00:00
Jake Barnby
66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 15:07:16 +13:00
Jake Barnby
37522ea66f
Merge branch '1.5.x' into fix-catch-exception 2024-02-13 12:47:36 +13:00
Jake Barnby
06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix
fix Indexes
2024-02-13 12:37:59 +13:00
fogelito
4018224cc6 parseQueries 2024-02-12 18:06:37 +02:00
fogelito
ace75b0786 parseQueries 2024-02-12 18:02:04 +02:00
fogelito
6c064430fb Merge branch '1.5.x' of github.com:appwrite/appwrite into json_syntax_error 2024-02-12 17:41:42 +02:00
fogelito
e5bada0493 typo 2024-02-12 12:03:31 +02:00
fogelito
2ef59134a0 Merge branch '1.5.x' of github.com:appwrite/appwrite into attributes-query-fix 2024-02-12 12:00:26 +02:00
fogelito
adbe11fd50 fix Indexes 2024-02-12 11:55:45 +02:00
shimon
e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
fogelito
bcc6564e5b typo 2024-02-08 18:18:39 +02:00
fogelito
7176d7feab Remove comment 2024-02-08 18:12:43 +02:00
fogelito
103fec1664 parseQueries 2024-02-08 18:10:25 +02:00
fogelito
98a6b96af9 Hardcode size and orders 2024-02-08 15:01:20 +02:00
Steven Nguyen
4ace8ed027
Replace catching \Exception with \Throwable
\Exception doesn't work as a catch-all because not everything extends
\Exception. For example, there was a problem where the messaging worker
didn't catch an exception here:

} catch (\Exception $e) {
    $deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
} finally {

As such, $deliveryErrors stayed as an empty array. In this case, the
$adapter->send() threw a TypeError which extends Error which implements
Throwable. Updating the catch to catch \Throwable ensures the error is
caught and $deliveryErrors gets updated.
2024-02-08 01:17:54 +00:00
shimon
a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby
0e8e455903
Fix spec generation 2024-02-02 23:54:34 +13:00
shimon
350d72eb1f updates 2024-02-01 12:21:50 +02:00
fogelito
a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Torsten Dittmann
9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
fogelito
667abce8f5 Create indexes & query contains 2024-01-21 18:22:02 +02:00
fogelito
3689435176 Arrays tests 2024-01-21 10:10:18 +02:00
fogelito
dc203a494e Syntax change 2023-12-20 12:55:09 +02:00
Damodar Lohani
5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00:00
Jake Barnby
121521d7c5
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/Hamster.php
2023-12-15 18:22:08 +13:00
Jake Barnby
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
2023-12-15 02:41:46 +13:00
fogelito
cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Jake Barnby
276d671921
Add temp parsing code 2023-12-13 22:45:01 +13:00
fogelito
4af00914a5 changes 2023-12-06 16:15:21 +01:00
fogelito
2fe50717d1 TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE 2023-12-06 15:10:40 +01:00
shimon
21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
Prateek Banga
b68be491b9 updated description 2023-11-17 20:59:09 +05:30
Prateek Banga
9183f2a875 changes enum size validation in update controller 2023-11-17 20:56:18 +05:30
Prateek Banga
ab35b75c37 fix test message 2023-11-17 20:14:55 +05:30
Prateek Banga
228b813994 fixes test case 2023-11-17 20:06:28 +05:30
Prateek Banga
827ad84f53 fixes adding longer length enum 2023-11-17 19:09:31 +05:30
fogelito
04afeb4a8d tests 2023-11-16 15:56:52 +02:00
prateek banga
8f53301209 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into more_review_changes 2023-11-14 12:26:35 +05:30
Prateek Banga
3654799cc7 links ISO 8601, move params in messaging controllers 2023-11-09 14:53:42 +05:30
shimon
ad63a377ab added inf metric 2023-11-08 11:09:32 +02:00
Steven Nguyen
55a73efeab Ensure usage endpoints don't throw 500 when usage is disabled 2023-11-06 21:28:45 +00:00
shimon
1c1028412a refactor users, project, functions usage display 2023-11-01 20:44:06 +02:00
shimon
04290730b2 refactor storage, databases usage display 2023-11-01 17:20:12 +02:00
shimon
4c6976488c clean up 2023-10-25 15:06:54 +03:00
shimon
9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
Jake Barnby
354211950f
Add timeout test 2023-10-19 17:06:57 +13:00
Jake Barnby
b6b8fe7d51
Allow overriding timeout per request in dev mode 2023-10-19 16:19:40 +13:00
Jake Barnby
db3fa21468
Update database 2023-10-19 14:26:44 +13:00
Christy Jacob
133cb62b4e fix: update injection name 2023-10-18 19:07:17 +00:00
Christy Jacob
4724d729fb Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes 2023-10-18 18:59:51 +00:00
Christy Jacob
066dd6393d Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes 2023-10-18 18:57:16 +00:00
Christy Jacob
72d0865ad8 chore: use deletes worker for deleting audit logs 2023-10-18 18:54:20 +00:00
Christy Jacob
050cb28d4f fix: incorrect events 2023-10-18 20:30:47 +04:00
Jake Barnby
dbfe5e45aa
Delegate custom deletes 2023-10-17 12:18:51 +13:00
shimon
2451d9fef1 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn
 Conflicts:
	src/Appwrite/Platform/Workers/Deletes.php
2023-10-16 17:06:59 +03:00
shimon
94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Torsten Dittmann
3778939605 fix: relative links to absolute 2023-10-13 15:43:23 +02:00
shimon
002fc19d60 tests fix 2023-10-10 21:02:24 +03:00
shimon
24e09d3d8e queueForBuilds fix via functions controller 2023-10-09 13:16:05 +03:00
shimon
948f36a023 sync with 1.4 2023-10-05 16:15:39 +03:00
shimon
7f1507f810 sync with 1.4 2023-10-04 11:20:32 +03:00
shimon
e3668a4d06 sync with 1.4 2023-10-03 21:56:36 +03:00
shimon
2bb4d8fb89 sync with 1.4 2023-10-02 17:02:48 +03:00
shimon
b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
shimon
dcf0107a79 sync with master 2023-09-27 20:10:21 +03:00
shimon
c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge
86f0e6008c
Merge branch 'master' into sentence-case 2023-09-27 11:11:58 -04:00
Matej Bačo
43b1c196e0 Merge branch 'feat-git-integration' into feat-git-integration-copy 2023-08-23 10:16:23 +02: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
07a7a710ee Improve error and copy in params/models 2023-08-22 20:11:33 +00: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
shimon
8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03: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
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
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
Jake Barnby
8820d422be
Update app/controllers/api/databases.php 2023-08-14 20:45:05 -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
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
prateek banga
8cefc54ca3 merge resolve conflicts 2023-08-10 17:22:15 +05:30
Jake Barnby
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
Jake Barnby
b196914638
Fix console/API key checks 2023-08-08 15:46:01 -04:00
prateek banga
51ceb5d74a prohibit select queries in list attributes and remove static method 2023-08-09 00:12:53 +05:30
Bishwajeet Parhi
2f3e14932a fix: Tests 2023-08-08 11:34:02 +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