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 |
|
Shmuel Fogel
|
bc9e928187
|
Merge pull request #3688 from appwrite/datetime-jake-tz
datetime tz
|
2022-08-17 21:36:39 +03:00 |
|
fogelito
|
04844b180b
|
composer updates
|
2022-08-17 21:15:25 +03: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 |
|
Christy Jacob
|
70f0483f97
|
Merge pull request #3652 from appwrite/feat-audits-label
|
2022-08-17 21:29:35 +05:30 |
|
fogelito
|
e425de9582
|
composer updates
|
2022-08-17 18:20:45 +03:00 |
|
fogelito
|
093a8be8a3
|
composer updates
|
2022-08-17 18:20:26 +03: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 |
|
fogelito
|
ae5163c813
|
tags changes
|
2022-08-17 17:38:40 +03:00 |
|
shimon
|
0abd8c4108
|
Merge remote-tracking branch 'origin/feat-audits-label' into feat-audits-label
|
2022-08-17 17:33:01 +03:00 |
|
shimon
|
9fc2e4c3a5
|
sync with 0.16
|
2022-08-17 17:29:22 +03:00 |
|
fogelito
|
5d99f7c3a6
|
after branch change to datetime attributes
|
2022-08-17 17:09:21 +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 |
|
Christy Jacob
|
f52bfacf0e
|
Update tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
|
2022-08-17 19:25:42 +05:30 |
|
Eldad A. Fux
|
837336e90f
|
Merge pull request #3491 from appwrite/feat-file-cache-cleanup
cache cleanup
|
2022-08-17 16:44:23 +03:00 |
|
shimon
|
73095a325e
|
addressing comments
|
2022-08-17 16:02:01 +03:00 |
|
shimon
|
bb4390e089
|
addressing comments
|
2022-08-17 14:18:22 +03:00 |
|
shimon
|
4b062ca76d
|
addressing comments
|
2022-08-17 14:11:34 +03:00 |
|
shimon
|
9cdb67a661
|
addressing comments
|
2022-08-17 14:09:15 +03:00 |
|
shimon
|
e94c7eba83
|
more audit labels on users new routes
|
2022-08-17 13:01:16 +03:00 |
|
shimon
|
4729444622
|
fix
|
2022-08-17 12:52:50 +03:00 |
|
shimon
|
835ef0ffc1
|
small fix
|
2022-08-17 12:25:47 +03:00 |
|
shimon
|
a4c0d89d55
|
sync with 0.16
|
2022-08-17 11:19:31 +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
|
1e404e379b
|
sync with 0.16
|
2022-08-17 10:59:23 +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 |
|
Jake Barnby
|
163782d4cd
|
Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
# composer.lock
# public/dist/scripts/app-all.js
# public/dist/scripts/app-dep.js
# public/dist/scripts/app.js
|
2022-08-17 15:34:41 +12:00 |
|
Jake Barnby
|
f36f176849
|
Role helper usage
|
2022-08-17 15:11:49 +12:00 |
|
Eldad A. Fux
|
aacdf50f63
|
Merge pull request #3620 from appwrite/feat-ui-datetime
ui: datetime
|
2022-08-16 23:49:37 +03:00 |
|
Christy Jacob
|
11ad9c8dd9
|
feat: update abuse library
|
2022-08-16 20:47:05 +00:00 |
|
Christy Jacob
|
d2305a7900
|
feat: update abuse library
|
2022-08-16 20:45:55 +00: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 |
|
Eldad A. Fux
|
ccb8a1144c
|
Merge pull request #2747 from appwrite/feat-password-hash-algos
Password Hashing algos
|
2022-08-16 22:30:23 +03:00 |
|
Eldad A. Fux
|
e0abc972ff
|
Merge pull request #3681 from appwrite/feat-missing-phone-param
Changed provider name from phone to sms and added phone param to create endpoints
|
2022-08-16 21:01:54 +03:00 |
|
Matej Bačo
|
7a1dfbfb8d
|
Fix passwordUpdate time for non-pass users
|
2022-08-16 15:56:54 +00:00 |
|
shimon
|
1abd57567f
|
linter fix
|
2022-08-16 18:02:17 +03:00 |
|
Matej Bačo
|
4e7c976608
|
Fix node runtime test
|
2022-08-16 14:58:42 +00:00 |
|
shimon
|
7ad7d1807e
|
fill gaps from merge
|
2022-08-16 17:56:05 +03:00 |
|
Matej Bačo
|
7d9f973c62
|
Fix escaping, write tests for stdout/stderr, upgrade runtimes to V2
|
2022-08-16 14:49:08 +00: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 |
|