Commit graph

2192 commits

Author SHA1 Message Date
emmdim 73937e0545 Updates dummy users 2019-12-19 01:25:29 +01:00
emmdim b31f315a76 Adds 'author_id' in /lot PATCH 2019-12-18 16:37:45 +01:00
emmdim c119c951f5 Propagates PATCH /lot updates to the involved devices 2019-12-18 14:29:25 +01:00
JNadeu cabcfaa830 adds new attributes on Computer model 2019-12-17 23:57:55 +01:00
JNadeu d6f5b78407 minor fixes 2019-12-17 22:30:29 +01:00
emmdim 4bdf9502d6 Minor updates 2019-12-17 17:16:13 +01:00
jordi.nadeu 552c2a4166 adds to dummy more users with ethereum address 2019-12-16 20:38:41 +01:00
jordi.nadeu fa99283389 add new attributes in Lot and User models 2019-12-16 19:17:30 +01:00
emmdim 58ff2e69e2 Adds receiver column in Lot model and updates
Lot views PATCH to be able to modify the needed values
2019-12-14 22:11:28 +01:00
jordi.nadeu 06cd114a8b add change in Lot and Actions views 2019-12-12 21:17:35 +01:00
jordi.nadeu 9b22bcd8f6 Merge remote-tracking branch 'origin/mvp' into deliverynote 2019-12-12 15:50:09 +01:00
jordi.nadeu 778db58272 Merge branch 'mvp' into deliverynote 2019-12-12 11:23:58 +01:00
emmdim 0f81be6878 Adds TransferStateEnum and makes it a Lot field 2019-12-12 01:25:11 +01:00
emmdim 856745ef91 Adds deposit and author is lot resources 2019-12-11 02:49:47 +01:00
emmdim 31357276ae Adds author_id to Computer resource 2019-12-11 02:19:13 +01:00
emmdim bdd996a132 Adds deposit field in Computer 2019-12-11 00:35:17 +01:00
jordi.nadeu f600a6edde first iteration integration with blockchain 2019-12-09 17:24:24 +01:00
jordi.nadeu 14d5379edb fix footer logo on public link report 2019-11-05 15:43:09 +01:00
jordi.nadeu 38bd39dd9a minor changes on public link report 2019-10-22 17:53:26 +02:00
jordi.nadeu b99a332cd8 change erasure report and public link html templates 2019-10-22 15:54:39 +02:00
jordi.nadeu 83d9d12afb delete visual test to compute rate (v1) 2019-10-22 15:53:44 +02:00
Xavier Bustamante Talavera 7bdc68ce8b Add lot template 2019-07-09 17:01:40 +02:00
Xavier Bustamante Talavera 92709512d0 Fix path without __file__ 2019-07-07 21:38:37 +02:00
Xavier Bustamante Talavera ce961a1bed Add MakeAvailable and Repair; add device.image; add templating file, change layout for project LOT 2019-07-07 21:36:09 +02:00
Xavier Bustamante Talavera f8ec8fc882 Change ReadyToUse for Available 2019-07-06 15:06:22 +02:00
Xavier Bustamante Talavera 922a8c743a Fix last commit changes 2019-07-02 10:42:56 +02:00
Xavier Bustamante Talavera f40f7187de Add Camera, LOTS project temporal devices 2019-07-01 20:39:32 +02:00
Xavier Bustamante Talavera c92d6b3282 Merge branch 'rate' into devel 2019-07-01 11:31:18 +02:00
Xavier Bustamante Talavera ad1781b9ec Set version, variant, sku as CIText 2019-07-01 11:30:48 +02:00
Xavier Bustamante Talavera 7e8c36ab3e Snyc with new Workbench models; fix SSL bug 2019-06-29 16:26:14 +02:00
Xavier Bustamante Talavera 904ef99c02 Fix opening correct README 2019-06-22 11:29:34 +02:00
nad 785147cda8 Merge remote-tracking branch 'origin/rate' into rate 2019-06-19 13:36:10 +02:00
nad 3d6fef9927 change comments to comply with the standard PEP 257 2019-06-19 13:35:26 +02:00
nad 02b92e2cf7 fix error in test multiple rates 2019-06-19 11:41:22 +02:00
Xavier Bustamante Talavera 6a459cf901 Merge branch 'master' into rate 2019-06-15 15:08:39 +02:00
Xavier Bustamante Talavera 9ad9e4a042 Formal changes to set up for 1.0a1 2019-06-15 15:08:08 +02:00
Xavier Bustamante Talavera b0d8ca39fe Merge remote-tracking branch 'origin/rate' into rate 2019-06-12 16:50:08 +02:00
Xavier Bustamante Talavera 928863bfdf Update comments in actions; remove workbench folder in rate 2019-06-12 16:49:55 +02:00
David Franquesa a36cdfbfe7 Add GPLV3 License 2019-06-09 08:48:09 +02:00
nad 970e1db228 improve reports and rate tests 2019-05-20 19:32:29 +02:00
nad 82bf20ff3d debug and improve tests about rate v1 2019-05-14 20:32:24 +02:00
nad c19783954e adding comments about rate algorithm 2019-05-14 20:31:43 +02:00
Xavier Bustamante Talavera 61f4c127d4 Change event to action complying with schema.org 2019-05-11 16:27:22 +02:00
Xavier Bustamante Talavera 0dc8ced255 Sort events by default using end_time 2019-05-10 18:00:38 +02:00
Xavier Bustamante Talavera 58be2162f7 Fix imprecisions in rate algorithms and small bugfixes 2019-05-10 11:58:38 +02:00
Xavier Bustamante Talavera 16d00256df Review rate changes 2019-05-08 19:12:05 +02:00
Xavier Bustamante Talavera e6d496872c Merge branch 'master' into rate
# Conflicts:
#	ereuse_devicehub/resources/event/models.py
#	ereuse_devicehub/resources/event/models.pyi
#	ereuse_devicehub/resources/event/schemas.py
2019-05-03 15:02:09 +02:00
Xavier Bustamante Talavera 6d5c891dfa Update requirements and setup 2019-05-03 14:49:43 +02:00
Xavier Bustamante Talavera 92be9c1aa1 Add fields in display and device; add battery, measureBattery 2019-05-03 14:31:49 +02:00
nad 252f995ac7 add order to snapshot events 2019-05-02 18:04:14 +02:00