Bradley Schofield
3c71164741
Merge branch '1.1.x' into feat-implement-session-length-api
2022-11-14 15:30:38 +00:00
Vincent (Wen Yu) Ge
9a1f54baf1
Merge branch 'master' into doc-unique-id
2022-10-21 17:43:52 -04:00
Damodar Lohani
dfa35e0a0b
fix periods on usage endpoints
2022-10-21 05:45:25 +00:00
Akshay Rana
da9133ae85
fixed: wrong error message show on adding duplicate number to a user
2022-10-04 23:48:15 +05:30
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
Jake Barnby
69d42fc980
Fix create scrypt user route param defaults types
2022-09-29 16:52:57 +13: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
Christy Jacob
626e4b1b8a
feat: update getSessions to listSessions in users and accounts API
2022-09-14 03:43:04 +05:30
Christy Jacob
937674a373
feat: update getLogs to listLogs in users and account API
2022-09-14 02:35:03 +05:30
Christy Jacob
183bb2e92d
feat: update getMemberships to listMemberships in Users API
2022-09-14 02:28:28 +05:30
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
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
shimon
1362902082
audit event name reformation
2022-09-05 11:00:08 +03:00
shimon
5d16c39d5f
account labels
2022-09-04 11:13:44 +03:00
Jake Barnby
b9148d380b
Fix only variables can passed by reference errors
2022-08-31 11:31:43 +12: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
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
