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

510 commits

Author SHA1 Message Date
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
prateek banga
52e800cc59 refactor according to review feedback 2023-08-08 02:56:20 +05:30
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
prateek banga
ea57a303d0 lint fixes 2023-08-03 17:39:13 +05:30
prateek banga
f797c2574a resolve merge conflicts with 1.4.x 2023-08-03 17:38:22 +05:30
prateek banga
1d558fa5f5 Add select queries support to list indexes and list attributes endpoint 2023-08-03 17:34:28 +05:30
prateek banga
f8ae04f3b9 resolve merge conflicts with 1.4.x branch 2023-08-03 15:25:48 +05:30
Dakshi
16a2135d4a updated based on review 2023-08-02 02:19:20 +05:30
prateek banga
40b0c081f7 remove checkPermission from Appwrite and more complex test case
This commit removes check pemission from update document in appwrite as permission is being checked by Utopia already. This commits also improves the test case to have 3 levels of depth with relationships
2023-08-01 23:29:15 +05:30
Dakshi
12228ccef4 converted desc to sentence case 2023-08-01 20:56:48 +05:30
Jake Barnby
ff83751450
Allow privileged user/app user/admin mode access to all resources when disabled 2023-07-31 14:24:21 -04:00
prateek banga
409376ef16 refactors checkPermission to throw exception when a change is found in updateDocument 2023-07-31 14:03:11 +05:30
Damodar Lohani
18407ce6ff remove failing alias and alias tests 2023-07-31 05:53:27 +00:00
prateek banga
f7e96282db adds attribute for update method and makes test case to check more complex scenario 2023-07-29 12:01:10 +05:30
Jake Barnby
aa94310259
Fix missing admin mode checks for collections 2023-07-28 11:37:14 -04:00
prateek banga
27e0ec339a fix more lint issues 2023-07-27 02:59:06 +05:30
prateek banga
6247e524b6 fix lint issues 2023-07-27 02:27:31 +05:30
prateek banga
e631f393fc fix lint issues and remove sleep from test 2023-07-27 02:23:20 +05:30
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Prateek Banga
5c5a8a9115 format issues 2023-07-27 02:03:17 +05:30
Prateek Banga
54ea98afb5 updated logic to skip checking permission if no change in new document 2023-07-27 02:03:10 +05:30
Prateek Banga
0fc0255a38 Skipping checking permission of relations that are not being updated 2023-07-27 02:02:34 +05:30
prateek banga
301af0d3fe fixes lint issues and adds status in list attributes query support 2023-07-27 01:24:47 +05:30
Prateek Banga
98a226dae9 adds collection and database calls for better error messages 2023-07-27 01:20:16 +05:30
Prateek Banga
a6abc7c4e8 add support of queries in list indexes 2023-07-27 01:19:48 +05:30
Prateek Banga
165268cb71 remove unnecessary db call 2023-07-27 01:17:19 +05:30
Prateek Banga
a842d7eeae fix queries param description 2023-07-27 01:17:10 +05:30
Prateek Banga
ead77d6cad Add support for queries in List attributes endpoint 2023-07-27 01:16:34 +05:30
Bishwajeet Parhi
f160c55ecb Chore: remove encrypt param on update Atrribute and tests as well 2023-07-26 11:25:25 +05:30
Bishwajeet Parhi
a15551368f Merge branch 'master' into feat-add-encrypt-param 2023-07-26 11:20:06 +05:30
Prateek Banga
f7c02d9308 removes extra db call and uses document find method 2023-07-24 23:41:49 +05:30
Prateek Banga
7d412b4741 adds get db call and get collection call 2023-07-24 12:02:28 +05:30
Prateek Banga
d569c17764 Merge branch 'master' of https://github.com/appwrite/appwrite into change-use-find-instead-iterating-index-array 2023-07-21 00:49:15 +05:30
Prateek Banga
b700336d45 fix get index route to use find 2023-07-20 14:52:05 +05:30
Steven Nguyen
187f3dc6ff
Update get logs APIs to return userId from data
The audit userId is actually the internal id and the user id is in the
data attribute.
2023-07-19 22:49:51 -07:00
Prateek Banga
8328dac86b lint issues 2023-07-19 14:08:02 +05:30
Prateek Banga
131e9658a5 change to use findOne instead of iterating index array 2023-07-19 14:04:35 +05:30
Damodar Lohani
4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00
Steven Nguyen
300d916621
Update get logs APIs to return userId from data
The audit userId is actually the internal id and the user id is in the
data attribute.
2023-07-12 10:27:57 -07:00
Bishwajeet Parhi
07df99c817 update description 2023-07-11 19:16:22 +05:30
Damodar Lohani
f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
Bishwajeet Parhi
f71fdfb0b9 chore: add encrypt param on update string attr + unit tests 2023-07-08 20:58:41 +05:30
Prateek Banga
f24cf729c3 fixed relationship update bug in two way type 2023-07-07 23:50:06 +05:30
Bishwajeet Parhi
e98e1db046 chore: fix trailing comma 2023-06-22 11:55:27 +05:30
Bishwajeet Parhi
cb35d2dbbe chore: fix missing nullable required param 2023-06-22 11:53:29 +05:30
Bishwajeet Parhi
ee30a3e9f4 chore: refactor tests and param positioning changes 2023-06-22 09:59:09 +05:30
Bishwajeet Parhi
7ce10023c0 chore: add tests and remove encrypt param on url,enum,ip,email 2023-06-21 16:15:00 +05:30
Bishwajeet Parhi
4efd178f40 remove encrypt on non string attributes 2023-06-21 15:22:04 +05:30
Bishwajeet Parhi
3aabaeb8be Merge branch 'master' into feat-add-encrypt-param 2023-06-21 15:12:47 +05:30
faisalill
7e8f6f748a fixed incorrect audity activity on document create 2023-06-17 00:20:37 +05:30
Jake Barnby
95b06c660a
Add index validator 2023-06-15 17:29:03 +12:00
Damodar Lohani
57411db2d3 upadate to use refactored collections config 2023-06-15 00:34:12 +00:00
Jake Barnby
031f8270ff
Merge remote-tracking branch 'origin/1.4.x' into validator-mv
# Conflicts:
#	composer.lock
2023-06-15 12:28:32 +12:00
Jake Barnby
b7f4f57521
Add new error message to differentiate between missing data and missing data + permissions for document updates 2023-06-07 13:51:24 +12:00
shimon
d820d93ac7 databases worker 2023-06-04 19:25:56 +03:00
Bishwajeet Parhi
0d3b50a07d Merge remote-tracking branch 'upstream/master' into feat-add-encrypt-param 2023-06-01 21:46:31 +05:30
Jake Barnby
d2bfe46fca
Set min length to 0 for default value when creating or updating a string attribute
(cherry picked from commit c61e54f69b)
2023-05-30 19:42:13 +12:00
Bishwajeet Parhi
08746d0390 chore: misc fixes 2023-05-30 12:47:55 +05:30
Bishwajeet Parhi
967ac1b82c chore: remove nullable param 2023-05-30 12:34:32 +05:30
Bishwajeet Parhi
69504bfaac add encrypt param 2023-05-30 12:30:10 +05:30
Jake Barnby
c61e54f69b
Set min length to 0 for default value when creating or updating a string attribute 2023-05-30 14:52:59 +12:00
Bishwajeet Parhi
68c56daba1 add extra check for admin modes 2023-05-26 17:08:09 +05:30
Bishwajeet Parhi
2873918cc5 Update databases.php
fix: tests
2023-05-24 22:56:58 +05:30
Bishwajeet Parhi
e496419572 remove formatting updates 2023-05-24 22:24:57 +05:30
Bishwajeet Parhi
6fc176d508 chore: add admin mode assertion for create collection 2023-05-24 17:58:40 +05:30
Bishwajeet Parhi
4706e6580d chore: add new checks 2023-05-24 15:39:08 +05:30
shimon
432ee72071 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	app/cli.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/teams.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	src/Appwrite/Event/Event.php
	src/Appwrite/Event/Mail.php
2023-05-22 18:41:24 +03:00
Bishwajeet Parhi
c2a13b079e chore: lowercase 2023-05-19 12:54:07 +05:30
Bishwajeet Parhi
40f70faa89 Feat: Add enable param in Database and Collection 2023-05-18 18:55:22 +05:30
fogelito
aae6b932d3 remove unnecessary hint 2023-05-16 17:49:12 +03:00