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 |
|
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 |
|
shimon
|
e94c7eba83
|
more audit labels on users new routes
|
2022-08-17 13:01:16 +03: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 |
|
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
|
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 |
|
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 |
|
Jake Barnby
|
5d84d6d43f
|
Lint
|
2022-08-16 20:33:06 +12: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 |
|
Jake Barnby
|
f672269a8c
|
Handle aggregates per resource type at the controller level
|
2022-08-16 17:54:44 +12:00 |
|
Damodar Lohani
|
4fb743e934
|
fix lint errors
|
2022-08-16 05:23:51 +00:00 |
|
Damodar Lohani
|
94d9bb8a18
|
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-functions-console-logs
|
2022-08-16 04:42:03 +00:00 |
|
Damodar Lohani
|
078b1ec377
|
updating to use if condition
|
2022-08-16 04:34:49 +00:00 |
|
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 |
|
shimon
|
f12ccfa02a
|
prefix removed from storage audits label
|
2022-08-15 16:59:58 +03:00 |
|
shimon
|
df0bdeb8a3
|
some fixes
|
2022-08-15 16:55:11 +03:00 |
|
Jake Barnby
|
bf2fa212aa
|
Fix setting defaults
|
2022-08-16 01:16:20 +12:00 |
|
Jake Barnby
|
28e7934aeb
|
Update document/file validator allowed permissions
|
2022-08-16 01:02:02 +12:00 |
|
Jake Barnby
|
b53f185ec6
|
Remove permissions processor
|
2022-08-16 00:56:19 +12:00 |
|
shimon
|
67d12d3120
|
some fixes
|
2022-08-15 15:16:32 +03:00 |
|
Jake Barnby
|
77a28a2de7
|
Don't use ID helper with existing ID's
|
2022-08-15 23:24:31 +12:00 |
|