Matej Bačo
79eb351381
Merge remote-tracking branch 'origin/feat-list-endpoints-queries' into feat-variables-api
2022-08-29 10:08:44 +00:00
Matej Bačo
3ab275201a
Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries
2022-08-29 09:33:18 +00:00
Matej Bačo
56282fb2fa
Fix users logs test
2022-08-29 09:16:18 +00:00
Matej Bačo
951ed70fb0
Merge branch 'feat-list-endpoints-queries' into feat-variables-api
2022-08-29 08:56:14 +00: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
Christy Jacob
f6e7d00b1e
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-list-users-queries
2022-08-27 20:21:51 +00:00
Jake Barnby
0389be522e
Only give current user create access in create collection test
2022-08-27 20:29:32 +12:00
Jake Barnby
790276fced
Review test updates
2022-08-27 15:16:37 +12:00
Matej Bačo
dca0b211f6
Implement queries into list variables
2022-08-26 13:38:39 +00:00
Matej Bačo
3b7ac045d7
Merge remote-tracking branch 'origin/feat-list-endpoints-queries' into feat-variables-api
2022-08-26 07:51:54 +00: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
Matej Bačo
281eb2fafe
Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-26 07:40:35 +00:00
Steven
60a4563908
Fix usage tests
2022-08-25 22:15:11 +00:00
Matej Bačo
6dcfbe2e17
Fix tests
2022-08-25 11:33:34 +00:00
Jake Barnby
a373297a6b
Add storage tests for all roles and permission levels
2022-08-25 23:29:23 +12:00
Matej Bačo
9d440552bd
Merge remote-tracking branch 'origin/feat-list-endpoints-queries' into feat-variables-api
2022-08-25 10:02:27 +00:00
Matej Bačo
c85363f355
Fix bugs after merge
2022-08-25 09:59:28 +00:00
Matej Baco
8513bb2dbe
Merge branch 'feat-list-endpoints-queries' into feat-variables-api
2022-08-25 11:14:42 +02:00
Matej Baco
fd1068a600
Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries
2022-08-25 10:56:06 +02:00
Matej Baco
c6e614d896
Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-25 10:38:43 +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
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
b765ad603d
Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api
2022-08-24 14:12:41 +00:00
Jake Barnby
e0a1f4b8fe
Database test updates
2022-08-25 01:32:52 +12:00
Matej Bačo
25590cc210
Add list queries test for databases
2022-08-24 12:43:07 +00:00
Matej Bačo
c3372e4a1f
Fix linter
2022-08-24 11:57:00 +00:00
Matej Bačo
22f05b4cf8
Include new tests, fix existing
2022-08-24 11:55:43 +00:00
Matej Bačo
4645fcd0c8
Fix tests
2022-08-24 10:31:47 +00:00
Matej Bačo
bd7395cb44
Bug fixing, upgrade tests to new syntax
2022-08-24 09:22:13 +00:00
Steven
146cb6a0d8
Fix list user logs tests
2022-08-19 23:31:02 +00:00
Steven
a5bc07c9e4
Merge branch 'feat-list-users-queries' into feat-list-user-logs-queries
2022-08-19 22:00:54 +00:00
Steven
f03510ef6b
Fix test after merge
2022-08-19 21:09:50 +00:00
Steven
c1cdad5566
Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-19 14:50:50 +00:00
Bradley Schofield
0d81918685
Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api
2022-08-19 11:25:39 +01: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
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
7c2ecaec4b
correct function status
2022-08-18 05:13:30 +00:00
Damodar Lohani
e63e79d3f9
linter fix
2022-08-18 01:50:55 +00:00
Damodar Lohani
acd5dfc23f
update functions test
2022-08-18 01:49:41 +00: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
Damodar Lohani
b28d3ce302
fix usage test
2022-08-18 00:36:25 +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
Damodar Lohani
fca655a48d
function usage test
2022-08-17 10:36:30 +00: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
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
1e404e379b
sync with 0.16
2022-08-17 10:59:23 +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
