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 |
|
shimon
|
e94c7eba83
|
more audit labels on users new routes
|
2022-08-17 13:01:16 +03: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 |
|
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 |
|
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 |
|
Jake Barnby
|
68cc919aaa
|
Test fixes
|
2022-08-14 02:10:28 +12:00 |
|
shimon
|
51e3fc8cab
|
some fixes
|
2022-08-13 12:59:34 +03:00 |
|
shimon
|
48b2fb0b36
|
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
|
2022-08-13 10:34:25 +03:00 |
|
Eldad Fux
|
3c7a7f0fa4
|
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes
|
2022-08-13 06:21:50 +03:00 |
|
Steven
|
1abe9d4c01
|
Merge branch '0.16.x' into fix-datetime-attributes
|
2022-08-12 22:54:33 +00:00 |
|
Bradley Schofield
|
83c1129ed5
|
Add TODO Warning
|
2022-08-12 17:01:25 +01:00 |
|
Bradley Schofield
|
930120fc4d
|
Update app/controllers/api/users.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
|
2022-08-12 16:55:58 +01:00 |
|
Bradley Schofield
|
7af92b3b30
|
Fix Endpoint Order
|
2022-08-12 15:10:41 +01:00 |
|
shimon
|
b5f977e46d
|
adding user to audits labels
|
2022-08-11 16:19:05 +03:00 |
|
shimon
|
d2519c9a5b
|
addressing comments
|
2022-08-09 17:38:54 +03:00 |
|
shimon
|
62ef532801
|
leftovers
|
2022-08-08 17:32:54 +03:00 |
|
Jake Barnby
|
bed6eb70af
|
Replace write refs
|
2022-08-05 17:23:32 +12:00 |
|
Jake Barnby
|
ce38e74ba2
|
Update remaining services to new permissions
|
2022-08-02 21:21:53 +12:00 |
|
Matej Bačo
|
15b5df10a4
|
Fix search attribute regarding phone number
|
2022-07-28 09:36:08 +00:00 |
|
Bradley Schofield
|
3c808ca895
|
Fix problem with Exception class
|
2022-07-26 15:56:59 +01:00 |
|
Bradley Schofield
|
96c6c0ff00
|
Migrate all exceptions to new signature
|
2022-07-26 15:24:32 +01:00 |
|
Matej Bačo
|
dbccf39a9f
|
Merge branch 'master' into feat-password-hash-algos
|
2022-07-25 12:37:07 +00:00 |
|
fogelito
|
45ac40cc85
|
change function names
|
2022-07-13 17:02:49 +03:00 |
|