Matej Baco
fd1068a600
Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries
2022-08-25 10:56:06 +02: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
fc38771d69
Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-24 18:52:39 +00:00
Matej Bačo
b765ad603d
Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api
2022-08-24 14:12:41 +00:00
Jake Barnby
e0a1f4b8fe
Database test updates
2022-08-25 01:32:52 +12:00
Matej Bačo
25590cc210
Add list queries test for databases
2022-08-24 12:43:07 +00:00
Matej Bačo
c3372e4a1f
Fix linter
2022-08-24 11:57:00 +00:00
Matej Bačo
22f05b4cf8
Include new tests, fix existing
2022-08-24 11:55:43 +00:00
Matej Bačo
4645fcd0c8
Fix tests
2022-08-24 10:31:47 +00:00
Matej Bačo
bd7395cb44
Bug fixing, upgrade tests to new syntax
2022-08-24 09:22:13 +00:00
Matej Bačo
11c8fccd88
PR review changes
2022-08-23 15:01:57 +00:00
Steven
66ff297103
Refactor Queries Validation
2022-08-22 19:16:20 +00:00
Steven
146cb6a0d8
Fix list user logs tests
2022-08-19 23:31:02 +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
f03510ef6b
Fix test after merge
2022-08-19 21:09:50 +00:00
Steven
c1cdad5566
Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries
2022-08-19 14:50:50 +00:00
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
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
7c2ecaec4b
correct function status
2022-08-18 05:13:30 +00:00
Damodar Lohani
e63e79d3f9
linter fix
2022-08-18 01:50:55 +00:00
Damodar Lohani
acd5dfc23f
update functions test
2022-08-18 01:49:41 +00:00
Damodar Lohani
3e43424129
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-18 00:49:31 +00:00
Damodar Lohani
b28d3ce302
fix usage test
2022-08-18 00:36:25 +00: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
Damodar Lohani
fca655a48d
function usage test
2022-08-17 10:36:30 +00: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
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
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
80dfa85c82
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-17 00:45:07 +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
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
shimon
de42895096
fill gaps from merge
2022-08-16 14:27:50 +03: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
Damodar Lohani
5472898759
fix naming
2022-08-15 00:50:51 +00:00
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
Damodar Lohani
e75dace600
fix storage usage test to match response
2022-08-14 11:19:24 +00:00
Damodar Lohani
cf86481d31
fix test to use updated response model
2022-08-14 11:16:54 +00: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
a91584853c
Merge pull request #3558 from appwrite/fix-teams-roles-no-owner
...
Fix teams roles no owner
2022-08-13 12:37:11 +03:00
Eldad A. Fux
ba239de8be
Merge branch '0.16.x' into fix-unit-tests
2022-08-13 12:28:33 +03:00
Damodar Lohani
74a159ab99
fix key
2022-08-13 03:44:57 +00: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
Jake Barnby
8d4191b1a0
Lint
2022-08-13 02:46:50 +12:00
Jake Barnby
09b001e891
PR fixes
2022-08-13 02:41:57 +12:00
Jake Barnby
d2b9102f84
Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
...
# Conflicts:
# tests/e2e/Services/Databases/DatabasesBase.php
# tests/e2e/Services/Databases/DatabasesCustomServerTest.php
2022-08-13 00:54:27 +12:00
Jake Barnby
5c6cb2a422
Test fixes
2022-08-13 00:49:57 +12:00
Jake Barnby
c104860448
Use roles validator for function execution
2022-08-13 00:23:58 +12:00
Jake Barnby
1d7c25b561
Single role per permissions entry
2022-08-12 22:36:59 +12:00
Damodar Lohani
b5f5aff626
fix response and project usage issues
2022-08-11 06:05:38 +00:00
Damodar Lohani
73f675aebe
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
2022-08-11 01:15:29 +00:00
Bradley Schofield
c566f1e7c9
Fix Tests 2: Electric Boogaloo
2022-08-10 10:32:48 +01:00
shimon
d31c23d25a
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
...
Conflicts:
app/controllers/api/databases.php
2022-08-10 12:18:05 +03:00
Jake Barnby
25e893f712
Revert sdk-generator to master
2022-08-10 18:02:23 +12:00
Bradley Schofield
42e0895dad
Fix Tests
2022-08-09 16:29:24 +01:00
Bradley Schofield
6882ffaa00
Merge branch '0.16.x' into feat-variables-api
2022-08-09 13:37:24 +01:00
fogelito
db5d737235
Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-api
...
Conflicts:
tests/e2e/Services/Databases/DatabasesBase.php
2022-08-09 14:37:21 +03:00