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
shimon
ee0950449a
Merge branch '1.1.x' of github.com:appwrite/appwrite into fix-cache-permissions
2022-11-15 17:17:58 +02:00
Bradley Schofield
3c71164741
Merge branch '1.1.x' into feat-implement-session-length-api
2022-11-14 15:30:38 +00:00
Bradley Schofield
a19e668d79
Update storage.php
2022-11-14 13:11:43 +00:00
shimon
180262d166
Merge branch '1.1.x' of github.com:appwrite/appwrite into fix-cache-permissions
2022-11-11 13:18:33 +02:00
shimon
f9671ee855
enabling file permissions
...
via cache preview
2022-11-10 12:08:01 +02:00
Bradley Schofield
a0ab934328
Fix another null warning
2022-11-09 13:23:14 +00:00
Bradley Schofield
29c30a361b
Fix null warnings
...
- Fixed Avatars isset operator
- Added isset operator to openSSL data in files
- dns_get_record does not throw errors, instead it logs a warning and returns false. Altered code accordingly. PHP Bug Report: https://bugs.php.net/bug.php?id=73149
-
2022-11-09 11:45:15 +00:00
Christy Jacob
9165da14b7
feat: add support for the new DSN class
2022-10-26 12:16:22 +05:30
Damodar Lohani
dfa35e0a0b
fix periods on usage endpoints
2022-10-21 05:45:25 +00:00
Damodar Lohani
a7e1e5f25f
fix period
2022-10-21 01:40:33 +00:00
Vincent (Wen Yu) Ge
4cee87273c
Merge branch 'master' into doc-unique-id
2022-10-04 10:51:38 -04:00
Vincent (Wen Yu) Ge
ae2100244f
Update unique() to be ID.unique()
2022-10-03 20:22:28 +00:00
Christy Jacob
ba0be549e3
Merge pull request #3881 from appwrite/fix-null-required-param
...
Fix: Null required ID params
2022-09-23 00:37:17 +05:30
Matej Bačo
a983e792d8
Refactor required param values
2022-09-19 10:05:42 +00:00
Steven Nguyen
00a4929301
Fix date format for usage APIs
2022-09-15 23:48:09 +00:00
shimon
5652e2d94f
audits.resource label update
2022-09-08 15:16:54 +03:00
shimon
834e4e03e3
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling
...
Conflicts:
app/controllers/api/storage.php
2022-09-08 15:13:22 +03:00
Jake Barnby
15939bb155
Merge remote-tracking branch 'origin/0.16.x' into fix-storage-audit-resources
2022-09-08 17:24:00 +12:00
Eldad Fux
01fb4045bd
Sync with 0.16
2022-09-07 14:11:10 +03:00
Eldad Fux
1f17fb34e4
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into fix-response-syntax
2022-09-07 14:07:40 +03:00
Eldad Fux
0895a25615
Fixed response syntax with new FW version
2022-09-07 14:02:36 +03:00
Jake Barnby
9665ec09e7
Make storage audit resources consistent with other resources
2022-09-07 20:22:25 +12:00
Jake Barnby
4590c464ef
Use write const
2022-09-06 21:17:25 +12:00
shimon
1362902082
audit event name reformation
2022-09-05 11:00:08 +03:00
Jake Barnby
e55faff0a1
Fix tests
2022-09-05 19:51:33 +12:00
Jake Barnby
5c08e066aa
Fix allowed permissions for documents/files
2022-09-05 13:41:01 +12:00
shimon
5d16c39d5f
account labels
2022-09-04 11:13:44 +03:00
Jake Barnby
1896193718
Fix missed optional updates
2022-09-03 12:44:33 +12:00
Jake Barnby
f4f178d3bf
Merge remote-tracking branch 'origin/rc-qa-matej' into fix-rc-qa
2022-09-03 11:44:14 +12:00
Matej Bačo
ae2826ad1f
Bug fixes
2022-09-02 14:19:36 +00:00
Jake Barnby
ddcb68c944
Make document/file security optional for create collection/bucket
2022-09-02 15:39:54 +12:00
Damodar Lohani
8fe365d66e
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support
2022-08-31 13:21:45 +00:00
Damodar Lohani
7b5cee8da9
fix description to use markdown for links
2022-08-31 10:24:13 +00:00
Damodar Lohani
d647bdaf9e
update compression attribute description
2022-08-31 09:55:55 +00:00
Christy Jacob
5a58312b53
Merge pull request #3741 from appwrite/refactor-guest-rate-limits
...
Refactor guest rate limits
2022-08-31 10:41:23 +02:00
Jake Barnby
ce28dd8201
Use route method in abuse key for guest writes
2022-08-31 15:58:32 +12:00
Damodar Lohani
594b66c18a
fix missing break
2022-08-31 02:59:51 +00:00
Damodar Lohani
bc7ec3854f
linter fix
2022-08-31 02:56:44 +00:00
Damodar Lohani
63f95c0a5c
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support
2022-08-31 02:55:26 +00:00
Jake Barnby
190d9684f0
Use consts for rate limit count + period
2022-08-31 11:34:17 +12:00
Jake Barnby
1d4866c5b5
Use IP + User ID as abuse key for create routes
2022-08-31 11:33:19 +12:00
Jake Barnby
b9148d380b
Fix only variables can passed by reference errors
2022-08-31 11:31:43 +12:00
Damodar Lohani
2d1741504a
compression on update bucket endpoint
2022-08-30 13:50:38 +00:00
Damodar Lohani
5fa7d34757
zstd compression support on endpoints
2022-08-30 13:46:55 +00:00
Christy Jacob
7591f68970
Merge pull request #3702 from appwrite/feat-list-endpoints-queries
...
Feat: List endpoint queries
2022-08-30 14:56:09 +02:00
Damodar Lohani
6c04550558
compression attribute on create bucket endpoint
2022-08-30 12:55:26 +00:00
Matej Bačo
63c02677a0
PR review changes
2022-08-30 13:55:23 +02:00
Matej Bačo
2b3dc48bf1
PR review changes
2022-08-30 08:21:34 +00:00
Jake Barnby
938f8394e0
Add abuse limits for create/update/delete document/file
2022-08-30 00:49:01 +12:00
Matej Bačo
889eaff418
Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries
2022-08-29 08:52:28 +00:00
Jake Barnby
ccfd104545
Allow guest write scope for document, file and execution
2022-08-29 17:53:37 +12:00
Jake Barnby
a16cd37f1a
Remove filter_var usage
2022-08-27 15:19:51 +12:00
Jake Barnby
c531213a5f
Doc updates
2022-08-27 15:19:00 +12:00
Matej Bačo
7f0507473d
Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries
2022-08-26 07:47:42 +00:00
Jake Barnby
a679f2f767
Improve permission parameter descriptions
2022-08-26 16:37:06 +12:00
Jake Barnby
57048400dc
Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into refactor-permissions-inc-console-fix
2022-08-26 15:01:39 +12:00
Jake Barnby
593c62116c
Review fixes
2022-08-26 15:01:16 +12:00
Jake Barnby
f945ab79ec
Apply suggestions from code review
...
Co-authored-by: Damodar Lohani <lohanidamodar@users.noreply.github.com>
2022-08-26 14:52:25 +12:00
Jake Barnby
8307b2148f
Remove redundant auth exceptions catches
2022-08-26 14:23:23 +12:00
Jake Barnby
e6e126dff4
Catch AuthorzationExceptions from database to throw 401 instead of 500
2022-08-25 23:30:26 +12:00
Matej Bačo
c85363f355
Fix bugs after merge
2022-08-25 09:59:28 +00:00
Matej Baco
fd1068a600
Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries
2022-08-25 10:56:06 +02:00
Jake Barnby
625608804e
Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
...
# 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/controllers/api/databases.php
# app/controllers/api/storage.php
# app/workers/builds.php
# src/Appwrite/Stats/Usage.php
# src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:21:15 +12:00
Jake Barnby
3149a298a7
Aggregate before role checks
2022-08-25 15:51:21 +12:00
Jake Barnby
002b30d110
Fix missing check for existing validity on listFiles
2022-08-25 13:05:31 +12:00
Jake Barnby
d4b270e527
Better storage permission checks
2022-08-25 01:24:54 +12:00
Matej Bačo
2d82eed4be
Linter fix
2022-08-23 13:10:27 +00:00
Matej Bačo
d1f6cb31d6
Upgrade listFiles queries
2022-08-23 08:49:39 +00:00
Matej Bačo
6fcd3757fe
Upgrade listBuckets queries
2022-08-23 08:37:55 +00:00
Jake Barnby
00441885d2
Remove fallback setting for missing permissions
2022-08-23 13:42:53 +12:00
Jake Barnby
e989735e89
Remove permissions processor
2022-08-23 13:42:25 +12:00
Damodar Lohani
c5a8e470c5
update usage labels to match audits labels pattern
2022-08-21 02:03:19 +00:00
Jake Barnby
cb6fc7f618
Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
...
# Conflicts:
# .gitignore
# app/config/collections.php
# app/controllers/api/account.php
# app/controllers/api/databases.php
# app/controllers/api/storage.php
# app/controllers/api/users.php
# composer.lock
# tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12:00
Jake Barnby
7019be987c
Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
...
# 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/controllers/api/account.php
# app/controllers/api/users.php
# app/controllers/shared/api.php
# app/workers/deletes.php
# composer.lock
# docker-compose.yml
# phpunit.xml
# src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Jake Barnby
66539bbe3a
Review updates for role helper usage
2022-08-19 16:04:33 +12:00
Damodar Lohani
3e43424129
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-18 00:49:31 +00:00
shimon
9fc2e4c3a5
sync with 0.16
2022-08-17 17:29:22 +03:00
shimon
cc9a166146
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
...
Conflicts:
app/controllers/api/storage.php
app/controllers/shared/api.php
2022-08-17 17:08:54 +03:00
shimon
9c68cff317
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
...
Conflicts:
composer.json
composer.lock
2022-08-17 11:16:09 +03:00
Damodar Lohani
80dfa85c82
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-17 00:45:07 +00:00
Jake Barnby
e3ec275a51
Cleaner permission checks
2022-08-16 23:26:38 +12:00
Jake Barnby
1aa36b6b2c
Simplify permission checks
2022-08-16 21:08:14 +12:00
Jake Barnby
326220762e
Exception fixes
2022-08-16 21:07:30 +12:00
Jake Barnby
5d84d6d43f
Lint
2022-08-16 20:33:06 +12:00
Jake Barnby
bbf7f8d8c3
Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
...
# Conflicts:
# app/controllers/api/databases.php
# app/controllers/api/storage.php
# src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby
fb34ecfa7d
Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
...
# Conflicts:
# 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
2022-08-16 19:20:26 +12:00
Jake Barnby
f672269a8c
Handle aggregates per resource type at the controller level
2022-08-16 17:54:44 +12:00
shimon
590c1467bc
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
...
Conflicts:
app/controllers/api/account.php
app/controllers/api/functions.php
app/controllers/api/users.php
2022-08-15 18:19:59 +03:00
shimon
f12ccfa02a
prefix removed from storage audits label
2022-08-15 16:59:58 +03:00
shimon
df0bdeb8a3
some fixes
2022-08-15 16:55:11 +03:00
Jake Barnby
bf2fa212aa
Fix setting defaults
2022-08-16 01:16:20 +12:00
Jake Barnby
28e7934aeb
Update document/file validator allowed permissions
2022-08-16 01:02:02 +12:00
Jake Barnby
b53f185ec6
Remove permissions processor
2022-08-16 00:56:19 +12:00
shimon
67d12d3120
some fixes
2022-08-15 15:16:32 +03:00
Jake Barnby
77a28a2de7
Don't use ID helper with existing ID's
2022-08-15 23:24:31 +12:00
Jake Barnby
813e9135c6
Review fixes
2022-08-15 22:11:17 +12:00
shimon
0dc485d8d7
some fixes
2022-08-15 12:05:41 +03:00
Jake Barnby
33970276b2
Self review
2022-08-15 19:20:10 +12:00
Damodar Lohani
a5aa20ac5c
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-15 05:35:14 +00:00
shimon
5e476a2e5a
some fixes
2022-08-15 07:29:44 +03:00
shimon
c0d8337417
some fixes
2022-08-14 23:45:05 +03:00
shimon
104e6564f7
some fixes
2022-08-14 23:06:21 +03:00
shimon
cabe989555
some fixes
2022-08-14 22:42:20 +03:00
shimon
1109004727
some fixes
2022-08-14 22:27:43 +03:00
shimon
857803e362
some fixes
2022-08-14 21:02:38 +03:00
shimon
ab27e0a74d
some fixes
2022-08-14 18:01:34 +03:00
Jake Barnby
613a0f8006
ID and test fixes
2022-08-15 02:22:38 +12:00
Jake Barnby
9c260164ef
Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
...
# Conflicts:
# app/controllers/api/databases.php
# app/controllers/api/storage.php
# app/controllers/general.php
# app/controllers/shared/api.php
# composer.json
# composer.lock
2022-08-14 23:46:34 +12:00
Jake Barnby
6a5de3e0b6
Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
...
# Conflicts:
# app/config/collections.php
# app/controllers/api/databases.php
# app/controllers/api/projects.php
# app/controllers/api/teams.php
# composer.json
# composer.lock
# tests/e2e/Services/Account/AccountBase.php
# tests/e2e/Services/Databases/DatabasesBase.php
# tests/e2e/Services/Functions/FunctionsCustomServerTest.php
# tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
# tests/e2e/Services/Storage/StorageBase.php
# tests/e2e/Services/Storage/StorageCustomClientTest.php
# tests/e2e/Services/Storage/StorageCustomServerTest.php
# tests/e2e/Services/Teams/TeamsBase.php
# tests/e2e/Services/Webhooks/WebhooksBase.php
# tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
# tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
# tests/unit/Auth/AuthTest.php
2022-08-14 23:11:05 +12:00
Jake Barnby
b007acfa95
ID updates
2022-08-14 22:33:36 +12:00
Christy Jacob
8e24dbe22f
feat: update exception class
2022-08-14 13:35:11 +05:30
Christy Jacob
cfab9221f2
feat: exceptions on more files
2022-08-14 12:32:41 +05:30
Christy Jacob
a5bc0a61ca
feat: exceptions on more files
2022-08-14 12:26:12 +05:30
Steven
610ec1a6a4
Update database query syntax
2022-08-14 05:44:55 +00:00
Jake Barnby
ed712fb196
Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
...
# Conflicts:
# app/controllers/general.php
# composer.lock
2022-08-14 02:31:06 +12:00
Jake Barnby
bdc8202422
Bad request for create permission on document/file
2022-08-14 02:24:28 +12:00
Jake Barnby
68cc919aaa
Test fixes
2022-08-14 02:10:28 +12:00
Jake Barnby
737ebe408c
Don't add create permission to documents/files if missing
2022-08-13 18:34:04 +12:00
Damodar Lohani
c1c325505b
organize metrics
2022-08-13 05:01:43 +00:00
Damodar Lohani
d688187e23
update metrics value
2022-08-13 04:39:01 +00:00
Damodar Lohani
74a159ab99
fix key
2022-08-13 03:44:57 +00:00