Matej Baco
|
fd1068a600
|
Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries
|
2022-08-25 10:56:06 +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 |
|
Matej Bačo
|
2d82eed4be
|
Linter fix
|
2022-08-23 13:10:27 +00:00 |
|
Matej Bačo
|
b1348dbdd8
|
Upgrade account logs queries
|
2022-08-23 13:06:59 +00:00 |
|
Damodar Lohani
|
6af467398b
|
update usage labels
|
2022-08-21 02:04:52 +00:00 |
|
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
|
66539bbe3a
|
Review updates for role helper usage
|
2022-08-19 16:04:33 +12:00 |
|
Damodar Lohani
|
db9faebcc9
|
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
|
2022-08-18 16:04:19 +05:45 |
|
Damodar Lohani
|
4d482ebb81
|
fix accounts PR
|
2022-08-18 00:31:56 +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
|
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 |
|
Damodar Lohani
|
3bc0aa8dca
|
fix merge issues
|
2022-08-17 02:35:55 +00: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 |
|
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
|
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 |
|
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
|
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
|
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 |
|
Damodar Lohani
|
34fd6763e1
|
Update app/controllers/api/account.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
|
2022-08-16 11:14:55 +05:45 |
|
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 |
|
Jake Barnby
|
77a28a2de7
|
Don't use ID helper with existing ID's
|
2022-08-15 23:24:31 +12:00 |
|
Eldad A. Fux
|
72e524963c
|
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
|
2022-08-15 11:30:58 +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 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
|
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
|
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 |
|
Eldad Fux
|
2ed9199bf1
|
Added the ability to create a user with a phone number
|
2022-08-14 18:10:12 +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 |
|
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 |
|
Damodar Lohani
|
5120158bdb
|
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
|
2022-08-14 11:39:41 +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 |
|
Christy Jacob
|
bb4693ddfc
|
feat: update email session endpoint
|
2022-08-14 15:41:21 +05:30 |
|
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 |
|
Christy Jacob
|
5296e61d35
|
feat: address issues on accounts controller
|
2022-08-13 20:45:19 +05:30 |
|
shimon
|
630954c94e
|
some fixes
|
2022-08-13 17:55:27 +03:00 |
|
Christy Jacob
|
8b23dcd69e
|
fix: update constructor, remove account entity, add missing ID error
|
2022-08-13 20:14:04 +05:30 |
|
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 |
|
shimon
|
cc9dad6bb8
|
Tidy up
|
2022-08-13 10:34:03 +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 |
|
Damodar Lohani
|
be00b64b7e
|
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
|
2022-08-13 03:14:28 +00:00 |
|
Steven
|
1abe9d4c01
|
Merge branch '0.16.x' into fix-datetime-attributes
|
2022-08-12 22:54:33 +00:00 |
|
Jake Barnby
|
09b001e891
|
PR fixes
|
2022-08-13 02:41:57 +12:00 |
|
Bradley Schofield
|
d86e4ac0b6
|
Run Linter
|
2022-08-12 15:15:58 +01:00 |
|
Bradley Schofield
|
d9104ceced
|
Update capitalisation on some names
|
2022-08-12 15:15:36 +01:00 |
|
Bradley Schofield
|
7af92b3b30
|
Fix Endpoint Order
|
2022-08-12 15:10:41 +01:00 |
|
shimon
|
1af95fcdaa
|
Tidy up
|
2022-08-12 16:21:32 +03:00 |
|
shimon
|
90cfac9b52
|
replace request param extractions
|
2022-08-12 14:01:12 +03:00 |
|
Jake Barnby
|
1d7c25b561
|
Single role per permissions entry
|
2022-08-12 22:36:59 +12:00 |
|
shimon
|
b5f977e46d
|
adding user to audits labels
|
2022-08-11 16:19:05 +03:00 |
|
Damodar Lohani
|
cb369dd326
|
update account routes usage labels
|
2022-08-10 08:45:10 +00:00 |
|
Damodar Lohani
|
16fe9e241a
|
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
|
2022-08-10 01:49:27 +00:00 |
|
shimon
|
d2519c9a5b
|
addressing comments
|
2022-08-09 17:38:54 +03:00 |
|
Damodar Lohani
|
bce998cb53
|
update imports and fix database usage
|
2022-08-09 06:28:38 +00:00 |
|
Jake Barnby
|
fb0168ea50
|
Fix erroneous whitespace
|
2022-08-09 14:48:39 +12:00 |
|
shimon
|
62ef532801
|
leftovers
|
2022-08-08 17:32:54 +03:00 |
|
shimon
|
89f164bdd7
|
resource namespace
|
2022-08-08 15:19:41 +03:00 |
|
shimon
|
a6a9ad8cc0
|
databases controller
|
2022-08-08 11:14:27 +03:00 |
|
shimon
|
e9ef94e8af
|
account controller
|
2022-08-07 18:49:30 +03:00 |
|
Jake Barnby
|
e8af744c97
|
More write ref updates
|
2022-08-05 18:00:56 +12:00 |
|
Jake Barnby
|
62b1eba836
|
Replace write refs
|
2022-08-05 17:23:18 +12:00 |
|
Jake Barnby
|
7b9fb32fae
|
Update role references
|
2022-08-03 21:52:34 +12:00 |
|
Jake Barnby
|
dbb8e5421a
|
Fix syntax error
|
2022-08-03 17:43:03 +12:00 |
|
Jake Barnby
|
1ab86c9331
|
Role reference updates
|
2022-08-03 16:17:49 +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
|
96c6c0ff00
|
Migrate all exceptions to new signature
|
2022-07-26 15:24:32 +01:00 |
|
Matej Bačo
|
ef3496d55b
|
Bug fixing afte merge
|
2022-07-25 12:37:29 +00:00 |
|
Matej Bačo
|
dbccf39a9f
|
Merge branch 'master' into feat-password-hash-algos
|
2022-07-25 12:37:07 +00:00 |
|
Bradley Schofield
|
40022decb4
|
Start working on simplifying exceptions
|
2022-07-22 15:38:06 +01:00 |
|
Torsten Dittmann
|
5604a6837f
|
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes
|
2022-07-14 14:14:05 +02:00 |
|
fogelito
|
45ac40cc85
|
change function names
|
2022-07-13 17:02:49 +03:00 |
|
fogelito
|
f384a3352b
|
change class from database:: to dateTime::
|
2022-07-12 16:32:39 +03:00 |
|
Steven
|
3666d0ab73
|
Add alias for POST /v1/account/sessions/email
Add /v1/account/sessions as an alias for POST /v1/account/sessions/email
for backwards compatibility.
|
2022-07-07 22:23:52 +00:00 |
|
fogelito
|
acba505144
|
addCookie timestamp
|
2022-07-05 21:24:10 +03:00 |
|
fogelito
|
203b3058a2
|
providerAccessTokenExpiry
|
2022-07-05 16:06:55 +03:00 |
|
fogelito
|
a9a91603d1
|
account expire
|
2022-07-05 13:59:03 +03:00 |
|
fogelito
|
903ca342cb
|
Model changes
|
2022-07-04 13:11:38 +03:00 |
|
fogelito
|
8628105eef
|
Model changes
|
2022-07-04 12:55:11 +03:00 |
|
Christy Jacob
|
9fdaa92bd1
|
feat: trigger sms for createVerification
|
2022-06-29 01:04:08 +02:00 |
|
Christy Jacob
|
43f834c0bd
|
feat: add new errors for phone auth
|
2022-06-24 12:49:00 +02:00 |
|