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