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 |
|
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 |
|
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 A. Fux
|
340cfb0104
|
Update app/controllers/api/users.php
|
2022-08-14 20:01:32 +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 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 |
|
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 |
|
shimon
|
630954c94e
|
some fixes
|
2022-08-13 17:55:27 +03: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 |
|
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 |
|
Damodar Lohani
|
02074a93ef
|
remove unused import
|
2022-08-13 04:55:42 +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 |
|
Bradley Schofield
|
83c1129ed5
|
Add TODO Warning
|
2022-08-12 17:01:25 +01:00 |
|
Bradley Schofield
|
930120fc4d
|
Update app/controllers/api/users.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
|
2022-08-12 16:55:58 +01:00 |
|
Bradley Schofield
|
7af92b3b30
|
Fix Endpoint Order
|
2022-08-12 15:10:41 +01:00 |
|
shimon
|
b5f977e46d
|
adding user to audits labels
|
2022-08-11 16:19:05 +03:00 |
|
Damodar Lohani
|
e666ae2b2e
|
fix users usage endpoint
|
2022-08-11 02:11:31 +00:00 |
|
Damodar Lohani
|
5647f957a7
|
users metrics via route labels
|
2022-08-11 01:43:02 +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 |
|
shimon
|
62ef532801
|
leftovers
|
2022-08-08 17:32:54 +03:00 |
|
Jake Barnby
|
bed6eb70af
|
Replace write refs
|
2022-08-05 17:23:32 +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
|
3c808ca895
|
Fix problem with Exception class
|
2022-07-26 15:56:59 +01:00 |
|
Bradley Schofield
|
96c6c0ff00
|
Migrate all exceptions to new signature
|
2022-07-26 15:24:32 +01:00 |
|
Matej Bačo
|
dbccf39a9f
|
Merge branch 'master' into feat-password-hash-algos
|
2022-07-25 12:37:07 +00: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 |
|
fogelito
|
7e08575245
|
builds, stats
|
2022-07-11 18:12:41 +03:00 |
|
fogelito
|
8628105eef
|
Model changes
|
2022-07-04 12:55:11 +03:00 |
|
Torsten Dittmann
|
e83cf382fd
|
fix: all sdks and specs
|
2022-06-28 13:21:28 +02:00 |
|
Matej Bačo
|
5a10a9494f
|
Update SCrypt tests
|
2022-06-24 14:30:39 +02:00 |
|
Matej Bačo
|
d9a88515bc
|
Merge remote-tracking branch 'origin/0.15.x' into feat-password-hash-algos
|
2022-06-21 14:03:19 +00:00 |
|
Torsten Dittmann
|
48177e8d03
|
docs: update new phone docs
|
2022-06-20 16:47:49 +02:00 |
|
Matej Baco
|
62ec121a5e
|
Improved docs
|
2022-06-17 11:25:28 +02:00 |
|
Matej Bačo
|
0aaee54a63
|
Fix snake_case
|
2022-06-16 09:21:35 +00:00 |
|
Torsten Dittmann
|
1eb91bc91e
|
feat: add ui for phone authentication
|
2022-06-14 17:41:58 +02:00 |
|
Matej Bačo
|
697bb569ef
|
Fix tests
|
2022-06-14 11:38:47 +00:00 |
|
Matej Bačo
|
0aaa5779ab
|
Linter fixes
|
2022-06-14 11:08:54 +00:00 |
|
Matej Bačo
|
f0cd4437d8
|
Rebuilds, improve tests
|
2022-06-14 10:40:51 +00:00 |
|
Matej Bačo
|
64ee483665
|
Implemented hashhing import API endpoints, fixed SCrypt
|
2022-06-14 09:05:46 +00:00 |
|
Matej Bačo
|
6f76fb3613
|
WIP: Separate hashing endpoints
|
2022-06-13 15:11:31 +00:00 |
|
Matej Bačo
|
bdaf9bcdb8
|
Removed hashhing algo from endpoints except import
|
2022-06-13 12:53:28 +00:00 |
|
Torsten Dittmann
|
68264a0fe0
|
fix: tests and adaption to review
|
2022-06-13 14:43:17 +02:00 |
|
Matej Bačo
|
7cb40f3c77
|
Fix order of params
|
2022-06-10 08:03:25 +00:00 |
|
Matej Bačo
|
0d94e4c9ce
|
Merge branch 'master' into feat-password-hash-algos
|
2022-06-10 08:03:09 +00:00 |
|
Torsten Dittmann
|
369c851532
|
Update app/controllers/api/users.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
|
2022-06-09 21:11:49 +02:00 |
|
Torsten Dittmann
|
dc25883685
|
feat: add update and verification method for account and users
|
2022-06-08 14:50:31 +02:00 |
|
Torsten Dittmann
|
8ce669da6f
|
feat: initial phone authentication
|
2022-06-08 11:00:38 +02:00 |
|
Everly Precia Suresh
|
c61dd1e261
|
remove unecessary semi colons
|
2022-05-31 14:24:01 +00:00 |
|
Everly Precia Suresh
|
746dc72439
|
fix merge conflicts
|
2022-05-31 11:32:46 +00:00 |
|
Everly Precia Suresh
|
8f624e115b
|
refactor users.php
|
2022-05-25 13:36:25 +00:00 |
|
Everly Precia Suresh
|
60a73c74a5
|
fix multi-line params in controllers
|
2022-05-23 16:42:27 +00:00 |
|
Everly Precia Suresh
|
19300ccdd7
|
format files in app, src, tests
|
2022-05-23 14:54:50 +00:00 |
|
Torsten Dittmann
|
0aa8aad2a9
|
fix: remove wrongly placed remove
|
2022-05-16 12:34:14 +02:00 |
|
Torsten Dittmann
|
bb0db796f7
|
feat: account update status
|
2022-05-16 11:58:17 +02:00 |
|
Torsten Dittmann
|
8fcc37e287
|
Merge pull request #3211 from appwrite/feat-api-user-memberships
feat(api): user memberships
|
2022-05-12 20:14:19 +02:00 |
|
Torsten Dittmann
|
54530b9c0d
|
fix: remove unused phpdocs
|
2022-05-12 16:26:12 +02:00 |
|
Torsten Dittmann
|
bf0506ecc7
|
feat: add user memberships endpoint
|
2022-05-12 15:20:06 +02:00 |
|
Torsten Dittmann
|
0525d2cc7b
|
fix: remove eventData
|
2022-05-10 15:52:55 +02:00 |
|
Torsten Dittmann
|
8012de5c4d
|
fix: rename webhook event header to plural
|
2022-05-10 14:13:53 +02:00 |
|
Torsten Dittmann
|
fdd16e44c6
|
Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model
|
2022-05-09 09:12:06 +02:00 |
|
Matej Bačo
|
4c642b99c5
|
Merge remote-tracking branch 'origin/0.14.x' into feat-sessions-subquery
|
2022-05-08 18:50:41 +00:00 |
|
Torsten Dittmann
|
33414b58b1
|
Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model
|
2022-05-08 17:25:01 +02:00 |
|
Torsten Dittmann
|
3990ef7fa2
|
Merge branch 'master' of https://github.com/appwrite/appwrite into 0.14.x
|
2022-05-08 17:15:25 +02:00 |
|
Torsten Dittmann
|
f5844df97b
|
Merge branch 'master' into feat-user-tokens-subquery
|
2022-05-08 16:39:24 +02:00 |
|
Torsten Dittmann
|
2cc2a40377
|
Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model
|
2022-05-08 15:11:14 +02:00 |
|
Matej Bačo
|
b0df349a23
|
QA fixes
|
2022-05-06 08:58:36 +00:00 |
|
Matej Bačo
|
814bb5c6b6
|
Finish hashing controllers
|
2022-05-05 11:21:31 +00:00 |
|
Matej Bačo
|
bc1b62f7da
|
Merge branch 'master' into feat-password-hash-algos
|
2022-05-04 13:33:32 +00:00 |
|
Matej Bačo
|
92d6ed6089
|
Implement memberships subquery
|
2022-04-27 12:44:47 +00:00 |
|
Matej Bačo
|
50082c3512
|
Implement user tokens subcollection
|
2022-04-27 11:06:53 +00:00 |
|
Matej Bačo
|
e0426598fc
|
Fix unfinished todos
|
2022-04-26 10:36:49 +00:00 |
|
Torsten Dittmann
|
487d38db95
|
fix(user): search integrity
|
2022-04-26 12:07:33 +02:00 |
|
Torsten Dittmann
|
379d074269
|
fix: users audit logs
|
2022-04-20 16:03:40 +02:00 |
|
Torsten Dittmann
|
8ec435ed1f
|
sync: changes
|
2022-04-17 22:34:32 +02:00 |
|
Torsten Dittmann
|
87b8fc3c41
|
feat: event classes for different cases
|
2022-04-13 14:39:31 +02:00 |
|
Matej Bačo
|
f69bd80b0e
|
SubQuery changes
|
2022-04-04 09:59:32 +00:00 |
|
Torsten Dittmann
|
2f9b9445dd
|
sync with devices
|
2022-04-04 08:30:07 +02:00 |
|
Matej Baco
|
56bf7a51df
|
Refactored 'sum' to 'total'
|
2022-02-27 10:57:09 +01:00 |
|
Christy Jacob
|
1ab27083c4
|
feat: update cursor errors
|
2022-02-09 02:56:11 +04:00 |
|
Christy Jacob
|
661630c1c6
|
Merge branch 'master' of github.com:appwrite/appwrite into feat-add-error-codes
|
2022-02-08 20:56:03 +04:00 |
|