Cayo Puigdefabregas
4172711c93
change the endpoints for allocate and deallocate
2020-11-27 18:10:51 +01:00
Cayo Puigdefabregas
60579437bb
resolve conflict
2020-11-23 16:32:06 +01:00
Cayo Puigdefabregas
3e8eb03b58
fixing bug
2020-11-23 15:53:56 +01:00
Cayo Puigdefabregas
73716a7331
fixing tests
2020-11-23 11:43:30 +01:00
Cayo Puigdefabregas
ee70288432
validate errors of allocate in scheme instead of signal
2020-11-22 18:47:58 +01:00
Cayo Puigdefabregas
32a17decd7
remove receives
2020-11-20 18:16:56 +01:00
Cayo Puigdefabregas
cf3d44a5e3
adding receives
2020-11-19 15:25:56 +01:00
Cayo Puigdefabregas
725e586e85
Merge branch 'testing' into bugfix/79-manual-merge
2020-11-09 16:11:12 +01:00
Cayo Puigdefabregas
73d9db3a88
fixing bug moving tags
2020-10-28 22:15:28 +01:00
Cayo Puigdefabregas
fe3f038218
refactoring and fixing some problems of manual merge
2020-10-28 13:30:22 +01:00
Cayo Puigdefabregas
1400d292ce
refactoring
2020-10-27 21:29:38 +01:00
Cayo Puigdefabregas
19279acaeb
clean view of merge
2020-10-27 19:13:31 +01:00
Cayo Puigdefabregas
ab1d268f14
rebuild the query for more post structured
2020-10-27 19:12:46 +01:00
Cayo Puigdefabregas
9a488887f5
modify devices models for add listeners
2020-10-16 16:25:46 +02:00
Cayo Puigdefabregas
a2b2be77f4
fixing get_device permissions
2020-08-18 12:35:04 +02:00
nad
a2a24f20cc
Reformat code following PEP8
2020-08-17 16:45:18 +02:00
nad
e372811d6e
Merge branch 'testing' into feature/22-device-lot-visibility
...
# Conflicts:
# ereuse_devicehub/resources/device/views.py
2020-08-05 13:00:22 +02:00
Jordi Nadeu
75150437b6
Adding severity to incomplete HID when POST an action Snapshot ( #32 )
...
* Adding severity to incomplete HID snapshot
* Minor fixes when HID are null
2020-07-07 17:17:19 +02:00
fedjo
d2d48280cb
Merge two devices ( #40 )
...
* Add authenticated view to merge two devices
* Assign actions of argument device to device
* Merge device components
* Sloppy implementation to test
* Correctly update base device
* Correctly append actions
2020-07-07 14:58:37 +02:00
yiorgos marinellis
2851d4112f
Fix typo
2020-04-28 22:55:17 +02:00
yiorgos marinellis
bd0621884b
Filter lots with owner id or deliverynote receiver or supplier
2020-04-28 22:33:33 +02:00
yiorgos marinellis
59d6d69bda
Add user filtering which is evaluate whether or not lot is specified
2020-04-28 21:20:40 +02:00
yiorgos marinellis
252c60ea89
Filter cumputer devices on current user and lot's deliverynote receiver
2020-04-22 17:53:06 +02:00
Big Lebowski
315f5b793a
Merge branch 'mvp_deliverynote' into devel
2020-04-13 22:45:25 +02:00
Big Lebowski
23b5afe1d8
Merge branch 'feature/rm-ethereum-constraint' into mvp_deliverynote
2020-04-13 13:21:51 +02:00
yiorgos marinellis
61fd9de477
Remove caching when returning lots, devices, fixes UI issue 18
2020-04-06 13:10:39 +02:00
yiorgos marinellis
e78b1c5db3
Change FOREIGN keys to User.ethereum_address to User.id, resolves #14
2020-04-06 13:08:07 +02:00
nad
713452e4e1
Fixing HID field to accepts null values
2020-03-25 16:47:57 +01:00
emmdim
bd396f0642
Adds new PATCH properties for device
2020-03-20 15:47:42 +01:00
emmdim
dfb518068d
Adds ethereum address to device, and adds PATCH
2020-03-19 01:55:26 +01:00
nad
16560462fa
Minor fixes to generate documentation correctly
2020-03-17 18:42:53 +01:00
emmdim
225e018cdc
Adds deposit field in Computer
2020-03-11 13:07:01 +01:00
jordi.nadeu
d1cff3e44e
first iteration integration with blockchain
2020-03-11 13:04:18 +01:00
nad
dc8aea9b9b
Adds display size to mobile device schema
2020-03-11 13:04:18 +01:00
nad
024a9a7d24
first iteration with mobile schema/model
2020-03-11 13:04:18 +01:00
emmdim
259285c59c
Makes deposit writable and applies range check from
...
0-100
2019-12-19 12:27:02 +01:00
emmdim
8a0957f512
Changes author_id (uid) to owner_address (ethereum)
...
and receiver_id to receiver_address (just the name)
+ minor impvrovements
2019-12-19 01:38:03 +01:00
JNadeu
cabcfaa830
adds new attributes on Computer model
2019-12-17 23:57:55 +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
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
Xavier Bustamante Talavera
7bdc68ce8b
Add lot template
2019-07-09 17:01:40 +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
