Bradley Schofield
|
0d81918685
|
Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api
|
2022-08-19 11:25:39 +01: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 |
|
|
Jake Barnby
|
66539bbe3a
|
Review updates for role helper usage
|
2022-08-19 16:04:33 +12: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 |
|
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 |
|
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
|
4e7c976608
|
Fix node runtime test
|
2022-08-16 14:58:42 +00:00 |
|
|
Matej Bačo
|
7d9f973c62
|
Fix escaping, write tests for stdout/stderr, upgrade runtimes to V2
|
2022-08-16 14:49:08 +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 |
|
|
Matej Bačo
|
1e96f8c3d9
|
Revert changes regarding AccountAPI createAccount
|
2022-08-16 12:05:46 +00:00 |
|
|
Jake Barnby
|
63977da7ee
|
Lint
|
2022-08-16 23:39:57 +12:00 |
|
|
Jake Barnby
|
24af94c569
|
Fix tests
|
2022-08-16 23:29:11 +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 |
|
|
fogelito
|
f52d28e75f
|
Auth tests
|
2022-08-15 22:18:37 +03:00 |
|
|
fogelito
|
9c82a842b6
|
tests for database + account
|
2022-08-15 19:08:17 +03:00 |
|
|
shimon
|
67d12d3120
|
some fixes
|
2022-08-15 15:16:32 +03:00 |
|
|
Jake Barnby
|
564f5dbf64
|
Find replace fix
|
2022-08-15 23:40:41 +12:00 |
|
|
Jake Barnby
|
77a28a2de7
|
Don't use ID helper with existing ID's
|
2022-08-15 23:24:31 +12:00 |
|
|
shimon
|
0dc485d8d7
|
some fixes
|
2022-08-15 12:05:41 +03:00 |
|
|
Jake Barnby
|
33970276b2
|
Self review
|
2022-08-15 19:20:10 +12:00 |
|
|
Christy Jacob
|
794f07c3b0
|
feat: accounts test
|
2022-08-15 12:13:09 +05:30 |
|
|
shimon
|
cabe989555
|
some fixes
|
2022-08-14 22:42:20 +03:00 |
|
|
Eldad Fux
|
9b897629ba
|
Fixed code generator
|
2022-08-14 21:57:23 +03:00 |
|
|
shimon
|
6fd01a6721
|
some fixes
|
2022-08-14 21:39:44 +03:00 |
|
|
Eldad Fux
|
fbd5835bd9
|
Fixed test
|
2022-08-14 21:33:52 +03:00 |
|
|
Eldad Fux
|
95181546b4
|
Adpated tests
|
2022-08-14 21:09:24 +03:00 |
|
|
Eldad Fux
|
bd77354926
|
Fixed test
|
2022-08-14 20:22:01 +03:00 |
|
|
Eldad Fux
|
be36b31c4e
|
Added missing test for new codeGenerator
|
2022-08-14 19:53:55 +03:00 |
|
|
Eldad Fux
|
22c38a484f
|
Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param
|
2022-08-14 19:43:53 +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 Fux
|
b36c24c508
|
Decouple Auth code from SMS provider adapter
|
2022-08-14 17:19:58 +03:00 |
|
|
Eldad Fux
|
25f176875d
|
Changed provider name from phone to sms
|
2022-08-14 16:43:41 +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 |
|
|
Jake Barnby
|
2ca2f4e135
|
Update audits
|
2022-08-14 03:17:18 +12:00 |
|
|
Jake Barnby
|
70758927cd
|
Test fixes
|
2022-08-14 02:55:15 +12: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 |
|
|
Eldad A. Fux
|
ba239de8be
|
Merge branch '0.16.x' into fix-unit-tests
|
2022-08-13 12:28:33 +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 |
|
|
Christy Jacob
|
9693c6e941
|
Merge branch 'master' of github.com:appwrite/appwrite into 0.16.x
|
2022-08-12 21:44:36 +05:30 |
|