shimon
429dabaaee
sync with 1.4
2023-10-03 19:50:48 +03:00
shimon
2bb4d8fb89
sync with 1.4
2023-10-02 17:02:48 +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
shimon
45f16e560c
sync against master
2023-09-05 21:17:54 +03:00
shimon
ec93239630
Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/config/collections.php
app/controllers/api/storage.php
app/controllers/shared/api.php
app/init.php
app/workers/deletes.php
2023-09-05 19:19:59 +03:00
Steven Nguyen
9bc6011876
Fix fileSecurity check
...
Because of the `getAttributes()` call, `$fileSecurity` was always true
which lead to invalid permission check. This resulted in files being
deleted when a user had delete permissions on the file even though
they didn't on the bucket.
2023-08-31 20:28:13 -07: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
2edbb1269f
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
2023-08-22 16:02:29 -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
Vincent (Wen Yu) Ge
caf6bcae95
Remove mention of environment variables in docs
2023-08-22 04:16:41 +00:00
Jake Barnby
942705b5f3
Fix database upgrade
2023-08-21 23:25:55 -04: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
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
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
Jake Barnby
d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param
2023-08-08 23:06:14 -04:00
Jake Barnby
b196914638
Fix console/API key checks
2023-08-08 15:46:01 -04:00
Eldad A. Fux
a56f91b054
Merge branch 'master' into feat-5542-validate-x-appwrite-id-header-for-CreateFile
2023-08-05 06:36:21 +03:00
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
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
Damodar Lohani
18407ce6ff
remove failing alias and alias tests
2023-07-31 05:53:27 +00:00
shimon
ef12b75013
Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/init.php
2023-07-22 17:09:49 +03:00
shimon
bed88baa6c
added bucketId to cache::deleteByResource
2023-07-22 17:08:28 +03:00
Damodar Lohani
4fd5c72f34
Merge branch 'master' into feat-1.4.x-with-1.3.x-master
2023-07-19 07:39:37 +00:00
Eldad A. Fux
11c9066c4d
Merge pull request #5402 from appwrite/fix-chunked-upload
...
content-range end should be 1 less than file size
2023-07-18 06:55:05 +03:00
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
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
shimon
a4e055e21b
cache deletion bug fix
2023-06-13 15:03:22 +03:00
shimon
8645757f28
cache deletion bug fix
2023-06-13 13:41:54 +03:00
shimon
41d207e862
cache deletion bug fix
2023-06-13 11:15:38 +03:00
Christy Jacob
a9e2eca8a4
Merge pull request #5683 from appwrite/master
...
Update 1.4.x from Master
2023-06-12 13:20:26 +05:30
Damodar Lohani
ed01b5abe3
update file name
2023-06-01 05:44:19 +00:00
shimon
a6768bdc32
saving file output to cache instead of decoding data to json
2023-05-31 14:41:56 +03:00
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
Suven-p
582698bd03
Validate value of x-appwrite-id header
2023-05-18 00:41:07 +05:45
shimon
1e29ec8d59
added bucketInternalId to file
2023-05-08 10:32:29 +03:00
fogelito
d55dc7a5b2
Merge branch 'master' of github.com:appwrite/appwrite into validator-mv
2023-05-07 12:23:02 +03:00
Damodar Lohani
fc36120a51
get file hash before encryption and compression
2023-05-07 11:33:27 +05:45
Torsten Dittmann
67ad856490
Merge pull request #5497 from appwrite/fix-bucket-permissions
...
Fix bucket permissions
2023-05-04 19:32:44 +02:00
Christy Jacob
60f51580a7
Merge pull request #5246 from singhbhaskar/fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled
...
Fix: Updated error when _APP_USAGE_STATS is disabled
2023-05-04 20:47:50 +05:30
Steven Nguyen
4dd6a7977e
Update create and update bucket APIs
...
Ensure the permissions and document security are updated in the
metadata collection.
2023-05-03 12:15:37 -07:00
fogelito
5e4ff01568
getByType
2023-05-01 12:18:50 +03:00
Damodar Lohani
edbc52403a
update so that current SDK don't fail
2023-04-27 09:29:39 +00:00
Bhaskar Singh
3865f48d32
Moved check for _APP_USAGE_STATS
...
to create init hook for App
2023-04-21 23:09:01 +05:30
Damodar Lohani
518b45827f
content-range end should be 1 less than file size
2023-04-19 02:17:26 +00:00
Vincent (Wen Yu) Ge
f952d57c88
Fix link in storage specs
2023-04-12 11:27:56 -04:00
Jake Barnby
7fe14ca10b
Merge remote-tracking branch 'origin/master' into sync-master
...
# 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
# app/console
# app/controllers/api/storage.php
# composer.lock
2023-04-12 00:50:31 +12:00
Jake Barnby
7f8f34793e
Merge remote-tracking branch 'origin/1.3.x' into doc-db-relationships
...
# Conflicts:
# composer.lock
2023-04-11 15:57:35 +12:00
Vincent (Wen Yu) Ge
6e9e6aa6b3
relink to inputfile docs
2023-04-10 22:18:07 +00:00
Vincent (Wen Yu) Ge
19d5ea03b9
Updates links for query page
2023-03-29 19:38:39 +00:00
Bhaskar Singh
ac2085ffa8
Updated error when _APP_USAGE_STATS is disabled
...
for usage
2023-03-18 22:12:36 +05:30
Torsten Dittmann
6e5b8fab4b
fix: implement new framework changes
2023-03-01 17:30:36 +05:30
Damodar Lohani
5acd78463a
Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync
2023-02-16 00:44:29 +00:00
Damodar Lohani
171f30adb1
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-02-16 00:29:37 +00:00
Damodar Lohani
71d2c45a92
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-02-14 04:35:19 +00:00
Jake Barnby
f6fc9a8d8c
Merge remote-tracking branch 'origin/master' into feat-technical-debt-2
...
# Conflicts:
# composer.lock
2023-02-14 14:22:08 +13:00
shimon
794f566fae
addressing comments
2023-02-06 16:03:45 +02:00
shimon
5850a454e0
addressing comments
2023-02-05 22:07:46 +02:00
Christy Jacob
e5a6db6133
Merge pull request #4890 from appwrite/doc-clarify-permission
...
Update permission and ID param descriptions for grammar and clarity.
2023-01-28 04:15:20 +05:30
Christy Jacob
7c2c68c5ec
Merge pull request #4988 from appwrite/fix-storage-device-case
...
Convert _APP_STORAGE_DEVICE env var to lowercase
2023-01-26 15:24:26 +05:30
Damodar Lohani
e70408094a
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-01-25 10:38:29 +00:00
Christy Jacob
4ea82fb2d0
Merge pull request #4795 from appwrite/fix-compression-logic
...
feat: use constants in switch case
2023-01-23 17:50:33 +05:30
Vincent (Wen Yu) Ge
b25dc38a63
clarify custom ID vs unique ID
2023-01-20 22:22:16 +00:00
Bradley Schofield
4cc135e8e2
Merge branch 'master' into fix-test-warnings
2023-01-17 10:16:53 +00:00
fogelito
c4ae047833
Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2
...
Conflicts:
app/init.php
composer.json
composer.lock
2023-01-16 10:24:37 +02:00
Vincent (Wen Yu) Ge
45aea5b941
Update branch with master
2023-01-13 14:53:54 -05:00
Vincent (Wen Yu) Ge
92a384e31c
Fix descriptions for ID and regen 1.2.x specs
2023-01-13 14:27:08 -05:00
Damodar Lohani
f41e3b1e8f
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-01-12 07:25:23 +00:00
Steven Nguyen
2b4dbfb4b9
Convert _APP_STORAGE_DEVICE env var to lowercase
...
This is done for backwards compatibility. Up to utopia-php/storage
version 0.12.X, the devices were not lowercase. Starting 0.13.X, they
are all converted to lowercase, but people would still have the old
case in their .env file. This change makes the value check insensitive
so that the value from older versions still works.
2023-01-11 11:41:26 -08:00
shimon
20f9b0c655
refactor usage worker
2022-12-22 15:02:41 +02:00
shimon
5e394fed5d
refactor usage worker
2022-12-21 21:03:09 +02:00
Vincent (Wen Yu) Ge
8239113b95
Grammarly check
2022-12-20 21:43:55 +00:00
Vincent (Wen Yu) Ge
37fc5114ab
Update permission param descriptions for grammar and clarity.
2022-12-20 21:39:41 +00:00
Bradley Schofield
c0daed3644
Refactor names and cleanup code
2022-12-20 16:11:30 +00:00
shimon
285bfe9fd7
e2e tests
2022-12-15 09:56:06 +02:00
fogelito
8ade726932
Changing Role + Permissions namespace
2022-12-14 18:04:06 +02:00
fogelito
f96128e14f
Changing Id
2022-12-14 17:42:25 +02:00
shimon
961c408885
metric negative / positive values in worker
2022-12-14 09:34:04 +02:00
Jake Barnby
aa7e326ce9
Allow file uploads from explorer
2022-12-13 15:43:29 +13:00
shimon
4c6b6d00e8
functions api usage
2022-12-07 19:56:38 +02:00
shimon
5d63d2f199
functions api usage
2022-12-07 19:01:25 +02:00
shimon
c9b6b3bf8b
storage api usage
2022-12-07 12:48:18 +02:00
Christy Jacob
77d4627d42
feat: use constants in switch case
2022-11-26 19:45:29 +04:00
Eldad Fux
95e835a902
Deprecated Usage stats
2022-11-23 19:08:42 +02:00
Christy Jacob
71bb70dec4
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-add-console
2022-11-17 23:27:26 +05:30
Christy Jacob
c4a5c73717
feat: use new storage library
2022-11-17 23:13:59 +05:30
Christy Jacob
080abbbb79
Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console
2022-11-17 20:26:10 +05:30
Christy Jacob
878021b9a3
feat: disable auth on console project
2022-11-17 18:20:17 +05:30
Christy Jacob
b989a35b62
feat: add todos
2022-11-17 08:04:05 +00:00
Christy Jacob
4f31fb5dc8
feat: linter
2022-11-17 07:46:00 +00:00
Christy Jacob
4271e34b39
feat: review comments
2022-11-17 07:44:54 +00:00
Christy Jacob
261830c122
Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-support-dsn
2022-11-17 06:43:49 +00:00