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
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
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
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