Commit Graph

2557 Commits

Author SHA1 Message Date
Cayo Puigdefabregas e058e2491f change model for trade 2021-04-19 19:33:05 +02:00
Cayo Puigdefabregas 55e27caa83 change migrations 2021-04-19 19:32:32 +02:00
Cayo Puigdefabregas 149255bcfe resolve conflicts 2021-04-16 18:16:07 +02:00
Cayo Puigdefabregas e9d85e3d9e resolv conflict 2021-04-16 15:46:19 +02:00
cayop 02fdcb1d42
Merge pull request #131 from eReuse/feature/#130-code-for-device
code for device
2021-04-16 15:05:09 +02:00
Cayo Puigdefabregas 5dc319486a update changelog 2021-04-16 14:49:03 +02:00
Cayo Puigdefabregas e6f098abc8 Merge branch 'testing' into feature/#130-code-for-device 2021-04-16 14:44:49 +02:00
Cayo Puigdefabregas ebe089499d fixing tests 2021-04-16 13:25:41 +02:00
Cayo Puigdefabregas 4122ac165e fixing tests 2021-04-16 12:45:14 +02:00
Cayo Puigdefabregas 68ffa0ddff fixing tests 2021-04-16 11:14:36 +02:00
Cayo Puigdefabregas 7836f2fc8d drop pdbs 2021-04-15 21:23:02 +02:00
Cayo Puigdefabregas 70188f43a2 simplify get_token method 2021-04-15 21:21:41 +02:00
Cayo Puigdefabregas 3f423e7712 drop schema users for view 2021-04-15 21:20:08 +02:00
Cayo Puigdefabregas e1f8f89a9b fixing auth for token 2021-04-15 21:19:20 +02:00
Cayo Puigdefabregas b3d77ba212 fixing model and migration 2021-04-15 21:18:15 +02:00
Cayo Puigdefabregas bae5a1d2b1 add session schema 2021-04-15 21:17:24 +02:00
Cayo Puigdefabregas 9c489c7564 fixing create new users 2021-04-15 21:16:32 +02:00
Cayo Puigdefabregas 5cc64d2d28 fixing test 2021-04-15 21:16:04 +02:00
Cayo Puigdefabregas 7ea3041aa0 authorized up snapshots with new token 2021-04-14 13:21:46 +02:00
Cayo Puigdefabregas d46db11813 adding devices from lot 2021-04-14 13:02:39 +02:00
Cayo Puigdefabregas e1cca540c4 change verification link for erasure certificate doc 2021-04-13 19:02:16 +02:00
Cayo Puigdefabregas ca85a1f221 check the token in a test 2021-04-13 18:34:18 +02:00
Cayo Puigdefabregas 21f019dc14 useing session table in wbconf 2021-04-13 18:33:49 +02:00
Cayo Puigdefabregas bfa9746de1 session table and model 2021-04-13 18:33:15 +02:00
Cayo Puigdefabregas 7e4513f5d2 Merge branch 'testing' into feature/#128-endpoint-config-wb 2021-04-12 19:48:23 +02:00
Cayo Puigdefabregas 4704045da8 more easy to read 2021-04-12 19:34:33 +02:00
Cayo Puigdefabregas 1620591deb fixing test_get_wbconf 2021-04-12 12:31:07 +02:00
Cayo Puigdefabregas 3be8678328 resolve bad name of var logout1 2021-04-12 12:10:57 +02:00
Cayo Puigdefabregas b9ff50978b Merge branch 'feature/#128-endpoint-config-wb' of https://github.com/eReuse/devicehub-teal into feature/#128-endpoint-config-wb 2021-04-12 12:07:00 +02:00
Cayo Puigdefabregas aa09413011 fixing review comments 2021-04-12 12:05:52 +02:00
cayop e40b297f3b
Update ereuse_devicehub/resources/documents/documents.py
Co-authored-by: Jordi Nadeu <j.nadeu@ereuse.org>
2021-04-12 11:47:26 +02:00
cayop 5af22b6ec6
Update ereuse_devicehub/resources/documents/documents.py
Co-authored-by: Jordi Nadeu <j.nadeu@ereuse.org>
2021-04-12 11:47:18 +02:00
Cayo Puigdefabregas 0138162bdf enlarge test of phantom account and components 2021-04-09 22:22:39 +02:00
Cayo Puigdefabregas 22633054ba fixing phantom account existing 2021-04-09 22:21:13 +02:00
Cayo Puigdefabregas a882396f09 check the propertary of the devices 2021-04-09 22:20:30 +02:00
Cayo Puigdefabregas 48894567c3 check if the validate user is one of the users of the trade 2021-04-09 20:12:30 +02:00
Cayo Puigdefabregas affeea4f52 check trade.confirm_transfer 2021-04-09 20:11:43 +02:00
Cayo Puigdefabregas 4157aa8273 adding test of active and phantom login 2021-04-09 20:10:52 +02:00
Cayo Puigdefabregas eae5422d42 resolve conflict 2021-04-09 14:57:26 +02:00
cayop 9d4e0d934e
Merge pull request #134 from eReuse/bugfix/dummy
fixing for todo trade pr
2021-04-09 14:54:27 +02:00
Cayo Puigdefabregas c5ef11e670 fixing for todo trade pr 2021-04-09 14:43:20 +02:00
Cayo Puigdefabregas 2ab9afa1e4 fixing migration 2021-04-08 21:31:50 +02:00
Cayo Puigdefabregas e88a508efb create correct migrations 2021-04-08 21:22:10 +02:00
Cayo Puigdefabregas b80322355f create automatic trade and creation of phantom account in the view 2021-04-08 21:21:29 +02:00
Cayo Puigdefabregas f7f60f6988 remove pdbs 2021-04-08 21:20:14 +02:00
Cayo Puigdefabregas 17a744a660 add filter active and phantom for login view 2021-04-08 21:19:24 +02:00
Cayo Puigdefabregas 9a43ab0097 add new columns in user model, (active and phantom fields) 2021-04-08 19:13:28 +02:00
Cayo Puigdefabregas a9ec5de237 do a better check from schema 2021-04-08 19:11:27 +02:00
Cayo Puigdefabregas ac5b55d04a new trade tests 2021-04-08 19:10:08 +02:00
Cayo Puigdefabregas 054f59453d fixing tests 2021-04-08 19:09:52 +02:00