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
bc73b7bbf0
Fix bugs after merge
2022-08-25 10:28:13 +00:00
Matej Bačo
f15f8e7bf0
Linter fix
2022-08-25 09:34:36 +00: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
66ff297103
Refactor Queries Validation
2022-08-22 19:16:20 +00:00
Damodar Lohani
2205ecd9c6
null safety checks
2022-08-20 11:20:31 +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
Steven
c1cdad5566
Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-19 14:50:50 +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
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
d4f02402bd
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-17 10:38:16 +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
88f6a67802
sync with 0.16
2022-08-17 10:36:38 +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
Matej Bačo
7a1dfbfb8d
Fix passwordUpdate time for non-pass users
2022-08-16 15:56:54 +00: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
shimon
de42895096
fill gaps from merge
2022-08-16 14:27:50 +03: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
shimon
8f8f033d1a
fill gaps from merge
2022-08-16 12:00:28 +03: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
Christy Jacob
5b7b39a300
Revert "Fix Endpoint Order"
2022-08-16 12:29:03 +05:30
shimon
9770f10a8c
fill gaps from merge
2022-08-15 20:33:44 +03:00
shimon
f091774afd
fill gaps from merge
2022-08-15 20:04:23 +03: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
Christy Jacob
7723c633a0
feat: fix tests
2022-08-15 13:24:54 +05:30
Christy Jacob
509f9083c9
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2
2022-08-15 12:43:24 +05:30
Eldad A. Fux
340cfb0104
Update app/controllers/api/users.php
2022-08-14 20:01:32 +03:00
Eldad Fux
7d83f9d644
Removed import path
2022-08-14 19:29:07 +03:00
Eldad Fux
98fc8669e1
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos
2022-08-14 19:23:30 +03:00
Jake Barnby
613a0f8006
ID and test fixes
2022-08-15 02:22:38 +12:00
Eldad A. Fux
d641fbb635
Merge pull request #3588 from appwrite/feat-simplify-exceptions
...
Simplify Exception Creation
2022-08-14 15:27:52 +03: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
Damodar Lohani
5120158bdb
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-14 11:39:41 +00: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
Steven
610ec1a6a4
Update database query syntax
2022-08-14 05:44:55 +00:00
Jake Barnby
fe5d3a1892
Use permission helpers
2022-08-14 17:21:11 +12:00
shimon
630954c94e
some fixes
2022-08-13 17:55:27 +03: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