fogelito
064d538023
Merge remote-tracking branch 'origin/origin/datetime-attributes' into origin/datetime-attributes
2022-08-25 11:14:48 +03:00
fogelito
c30189f903
Vincent Changes Apply
2022-08-25 11:14:27 +03:00
Shmuel Fogel
c04734048f
Update app/controllers/api/databases.php
...
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
2022-08-25 11:05:01 +03:00
Jake Barnby
e7298b13b0
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/workers/builds.php
# src/Appwrite/Stats/Usage.php
# src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:26:30 +12: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
b434dfb6b8
Fix missing check for existing validity on listDocuments
2022-08-25 13:04:47 +12:00
Steven
fc38771d69
Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-24 18:52:39 +00:00
Matej Bačo
65d09705ac
Simplify class name
2022-08-24 18:25:15 +00:00
Jake Barnby
d4b270e527
Better storage permission checks
2022-08-25 01:24:54 +12:00
Jake Barnby
0d3c1cba9a
Better database permission checks
2022-08-25 01:24:19 +12:00
Matej Bačo
bd7395cb44
Bug fixing, upgrade tests to new syntax
2022-08-24 09:22:13 +00:00
Jake Barnby
dabaa49f8d
Remove redundant extra permissions checks for document read/update/delete
2022-08-24 20:50:05 +12:00
Jake Barnby
ea4b177b83
Fix team permissions
2022-08-24 20:26:47 +12:00
Matej Bačo
01a57d91ad
Fix listDocument queries validation
2022-08-23 16:33:08 +00:00
Matej Bačo
7fb74027d4
Upgrade listDocuments queries
2022-08-23 15:18:59 +00:00
Matej Bačo
531d57feff
Upgrade listMemberships queries
2022-08-23 13:16:46 +00:00
Matej Bačo
2d82eed4be
Linter fix
2022-08-23 13:10:27 +00:00
Matej Bačo
b1348dbdd8
Upgrade account logs queries
2022-08-23 13:06:59 +00:00
Matej Bačo
36903d6358
Upgrade document&collection&database logs queries
2022-08-23 13:03:38 +00:00
Matej Bačo
79560c13e6
Upgrade teamListLogs queries
2022-08-23 12:50:52 +00:00
Matej Bačo
e068bcdbc1
Upgrade listCollections queries
2022-08-23 12:30:28 +00:00
Matej Bačo
94acd32d69
Upgrade listDatabases queries
2022-08-23 09:40:17 +00:00
Matej Bačo
17e41eee1d
Upgrade listExecutions queries
2022-08-23 09:26:34 +00:00
Matej Bačo
a92f96bf80
Upgrade listDeployments queries
2022-08-23 09:12:48 +00:00
Matej Bačo
1eee0baa28
Upgrade listFunctions queries
2022-08-23 09:02:06 +00:00
Matej Bačo
6c971f6ece
Upgrade listTeams queries
2022-08-23 08:56:28 +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
Matej Bačo
e780c90dd6
Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries
2022-08-23 08:10:13 +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
Steven
66ff297103
Refactor Queries Validation
2022-08-22 19:16:20 +00:00
Jake Barnby
eb1476b28b
Apply validator updates to OpenAPI3
2022-08-22 14:27:17 +12:00
Damodar Lohani
fa165a735b
linter fix
2022-08-21 10:16:55 +00:00
Damodar Lohani
0d57c67cc0
use same method to parse usage params labels
2022-08-21 02:10:42 +00:00
Damodar Lohani
77958b465e
update database usage params label
2022-08-21 02:10:21 +00:00
Damodar Lohani
6af467398b
update usage labels
2022-08-21 02:04:52 +00:00
Damodar Lohani
c5a8e470c5
update usage labels to match audits labels pattern
2022-08-21 02:03:19 +00:00
Damodar Lohani
2205ecd9c6
null safety checks
2022-08-20 11:20:31 +00:00
Christy Jacob
7952dac85e
feat: linter fixes
2022-08-20 07:41:07 +00:00
Steven
e70eb61717
Fix bug with list documents and new queries
2022-08-20 00:47:10 +00:00
Steven
2bde7aa02b
Fix databases tests
2022-08-20 00:15:18 +00:00
Steven
3890dea35b
Add additional Validators for Queries
2022-08-19 23:20:22 +00:00
Steven
a5bc07c9e4
Merge branch 'feat-list-users-queries' into feat-list-user-logs-queries
2022-08-19 22:00:54 +00:00
Christy Jacob
ca25d329ae
feat: update date time calculation
2022-08-19 20:22:38 +05:30
Steven
c1cdad5566
Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-19 14:50:50 +00:00
Matej Bačo
926d1c6459
Fix incorrect endpoint information
2022-08-19 14:14:39 +00:00
Christy Jacob
74a5bd2556
feat: update default values
2022-08-19 09:54:26 +00:00
Christy Jacob
2a750eaa73
Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys
2022-08-19 09:32:22 +00:00
Christy Jacob
278afd77c0
Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys
2022-08-19 09:20:08 +00:00
Jake Barnby
e4392bdbfb
Merge fixes
...
(cherry picked from commit 24875e352d
2022-08-19 17:12:20 +12:00
Jake Barnby
24875e352d
Merge fixes
2022-08-19 17:05:39 +12: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
5f990ecb6d
Fix imports
2022-08-19 16:28:40 +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
9819088563
Lint
2022-08-19 16:05:00 +12:00
Jake Barnby
66539bbe3a
Review updates for role helper usage
2022-08-19 16:04:33 +12:00
Steven
27f69e3c09
Consolidate List User Logs API params
...
Replace limit and offset params with a single queries param since the
Queries V2 change now allows for different types of queries.
2022-08-19 00:09:34 +00:00
Steven
f0d66985f7
Consolidate List Users API params
...
Replace search, limit, offset, cursor, cursorDirection, and orderType
params with a single queries param since the Queries V2 change now
allows for different types of queries.
2022-08-18 19:30:39 +00:00
Damodar Lohani
db9faebcc9
Update app/controllers/api/account.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-18 16:04:19 +05:45
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
Damodar Lohani
4d482ebb81
fix accounts PR
2022-08-18 00:31:56 +00:00
fogelito
c21b563614
Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz
...
Conflicts:
app/controllers/general.php
composer.json
composer.lock
2022-08-17 21:04:23 +03:00
shimon
d1aa3fea4f
sync with 0.16
2022-08-17 18:03:53 +03:00
shimon
a2af9fef2d
sync with 0.16
2022-08-17 17:57:56 +03: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
Damodar Lohani
c0119e6a0d
fix formatting
2022-08-17 11:10:17 +00:00
Damodar Lohani
6b11fa26ce
rename and remove unused param
2022-08-17 10:55:01 +00:00
Damodar Lohani
d4f02402bd
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-17 10:38:16 +00:00
Damodar Lohani
0d97580361
fix usage params in execution
2022-08-17 10:13:50 +00:00
shimon
e94c7eba83
more audit labels on users new routes
2022-08-17 13:01:16 +03:00
Damodar Lohani
a1e6f7bdf4
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-17 09:34:40 +00:00
shimon
835ef0ffc1
small fix
2022-08-17 12:25:47 +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
shimon
88f6a67802
sync with 0.16
2022-08-17 10:36:38 +03:00
shimon
cc887beae9
sync with 0.16
2022-08-17 10:32:42 +03:00
shimon
2dc8fba40a
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
...
Conflicts:
app/controllers/api/account.php
app/controllers/api/users.php
composer.json
composer.lock
2022-08-17 10:05:37 +03:00
Damodar Lohani
3bc0aa8dca
fix merge issues
2022-08-17 02:35:55 +00: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
Christy Jacob
4b0c707fd3
Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime
2022-08-16 20:37:05 +00:00
Eldad A. Fux
69a4f51d58
Merge pull request #3656 from appwrite/feat-functions-console-logs
...
Functions Console Logs Capture
2022-08-16 23:23:53 +03:00
Matej Bačo
7a1dfbfb8d
Fix passwordUpdate time for non-pass users
2022-08-16 15:56:54 +00:00
shimon
1abd57567f
linter fix
2022-08-16 18:02:17 +03:00
shimon
7ad7d1807e
fill gaps from merge
2022-08-16 17:56:05 +03:00
shimon
5d284b8c27
fill gaps from merge
2022-08-16 16:20:35 +03:00
Matej Bačo
2814a6f680
Linter fix
2022-08-16 13:03:38 +00:00
Matej Bačo
3088535806
Added phone number to UsersAPI createUser + tests
2022-08-16 13:02:28 +00:00
Christy Jacob
51cb03a93e
feat: linter fix
2022-08-16 17:58:30 +05:30
Jake Barnby
b09aaabd14
Fix teams exception
2022-08-17 00:14:22 +12:00
Matej Bačo
1e96f8c3d9
Revert changes regarding AccountAPI createAccount
2022-08-16 12:05:46 +00:00
shimon
de42895096
fill gaps from merge
2022-08-16 14:27:50 +03:00
Jake Barnby
e3ec275a51
Cleaner permission checks
2022-08-16 23:26:38 +12:00
shimon
beaad6c49d
fill gaps from merge
2022-08-16 13:19:38 +03:00
shimon
923a741c5a
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-16 12:47:51 +03: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
shimon
8f8f033d1a
fill gaps from merge
2022-08-16 12:00:28 +03:00
