349170aa99
nullable chassis
2020-12-16 11:57:51 +01:00
729281383e
resolve conflicts
2020-12-10 10:30:50 +01:00
2c67e3be93
resolve conflict
2020-12-09 12:32:00 +01:00
eaa20b4302
fixing conflict merge with testing
2020-12-09 11:12:47 +01:00
7e41c66073
implementing the warnings and unnormal cases
2020-12-04 16:58:53 +01:00
05c81382f2
change comment of allocated
2020-12-01 15:55:21 +01:00
4172711c93
change the endpoints for allocate and deallocate
2020-11-27 18:10:51 +01:00
ef563e3595
resolve confict
2020-11-25 19:09:24 +01:00
0c1e5b8307
changes from review
2020-11-25 18:42:36 +01:00
60579437bb
resolve conflict
2020-11-23 16:32:06 +01:00
3e8eb03b58
fixing bug
2020-11-23 15:53:56 +01:00
73716a7331
fixing tests
2020-11-23 11:43:30 +01:00
ee70288432
validate errors of allocate in scheme instead of signal
2020-11-22 18:47:58 +01:00
32a17decd7
remove receives
2020-11-20 18:16:56 +01:00
cf3d44a5e3
adding receives
2020-11-19 15:25:56 +01:00
0ab8a36832
bugfix with none in the mac serial
2020-11-13 11:05:00 +01:00
791308d8e8
modify hid when create the snapshot
2020-11-12 21:00:07 +01:00
82a3344965
centralized in one point the hid
2020-11-12 20:57:33 +01:00
554ec254d8
identation problem
2020-11-11 16:59:30 +01:00
17f1ff98e7
adding update hid when insert one manual or automatic snapshot
2020-11-11 16:53:41 +01:00
0a7e805f3e
clean events from device models
2020-11-11 16:52:02 +01:00
cbe6bb7e90
adding mac of networkadapter to hid
2020-11-10 20:45:03 +01:00
725e586e85
Merge branch 'testing' into bugfix/79-manual-merge
2020-11-09 16:11:12 +01:00
3eecdb4a1e
filter from owners in get private device or redirect to public and filter devices from owner the manual merge
2020-11-06 17:13:37 +01:00
8a471c98c0
todo an automatic merge with sync only of your devices
2020-11-06 17:10:32 +01:00
52bd6d5271
fixed similar_one for get only from your devices
2020-11-06 17:09:39 +01:00
9b25132c29
fixed bug for use filters from the website
2020-11-04 17:30:12 +01:00
50a7b59957
fixed bug: owner_id is not a physical property
2020-11-03 20:26:03 +01:00
5ac1e8efba
adding manually migrate and change model of device
2020-10-30 21:08:55 +01:00
73d9db3a88
fixing bug moving tags
2020-10-28 22:15:28 +01:00
fe3f038218
refactoring and fixing some problems of manual merge
2020-10-28 13:30:22 +01:00
1400d292ce
refactoring
2020-10-27 21:29:38 +01:00
19279acaeb
clean view of merge
2020-10-27 19:13:31 +01:00
ab1d268f14
rebuild the query for more post structured
2020-10-27 19:12:46 +01:00
9a488887f5
modify devices models for add listeners
2020-10-16 16:25:46 +02:00
a2b2be77f4
fixing get_device permissions
2020-08-18 12:35:04 +02:00
a2a24f20cc
Reformat code following PEP8
2020-08-17 16:45:18 +02:00
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
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
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
2851d4112f
Fix typo
2020-04-28 22:55:17 +02:00
bd0621884b
Filter lots with owner id or deliverynote receiver or supplier
2020-04-28 22:33:33 +02:00
59d6d69bda
Add user filtering which is evaluate whether or not lot is specified
2020-04-28 21:20:40 +02:00
252c60ea89
Filter cumputer devices on current user and lot's deliverynote receiver
2020-04-22 17:53:06 +02:00
315f5b793a
Merge branch 'mvp_deliverynote' into devel
2020-04-13 22:45:25 +02:00
23b5afe1d8
Merge branch 'feature/rm-ethereum-constraint' into mvp_deliverynote
2020-04-13 13:21:51 +02:00
61fd9de477
Remove caching when returning lots, devices, fixes UI issue 18
2020-04-06 13:10:39 +02:00
e78b1c5db3
Change FOREIGN keys to User.ethereum_address to User.id, resolves #14
2020-04-06 13:08:07 +02:00
713452e4e1
Fixing HID field to accepts null values
2020-03-25 16:47:57 +01:00
bd396f0642
Adds new PATCH properties for device
2020-03-20 15:47:42 +01:00
dfb518068d
Adds ethereum address to device, and adds PATCH
2020-03-19 01:55:26 +01:00
16560462fa
Minor fixes to generate documentation correctly
2020-03-17 18:42:53 +01:00
225e018cdc
Adds deposit field in Computer
2020-03-11 13:07:01 +01:00
d1cff3e44e
first iteration integration with blockchain
2020-03-11 13:04:18 +01:00
dc8aea9b9b
Adds display size to mobile device schema
2020-03-11 13:04:18 +01:00
024a9a7d24
first iteration with mobile schema/model
2020-03-11 13:04:18 +01:00
259285c59c
Makes deposit writable and applies range check from
...
0-100
2019-12-19 12:27:02 +01:00
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
cabcfaa830
adds new attributes on Computer model
2019-12-17 23:57:55 +01:00
31357276ae
Adds author_id to Computer resource
2019-12-11 02:19:13 +01:00
bdd996a132
Adds deposit field in Computer
2019-12-11 00:35:17 +01:00
14d5379edb
fix footer logo on public link report
2019-11-05 15:43:09 +01:00
38bd39dd9a
minor changes on public link report
2019-10-22 17:53:26 +02:00
b99a332cd8
change erasure report and public link html templates
2019-10-22 15:54:39 +02:00
7bdc68ce8b
Add lot template
2019-07-09 17:01:40 +02:00
ce961a1bed
Add MakeAvailable and Repair; add device.image; add templating file, change layout for project LOT
2019-07-07 21:36:09 +02:00
f8ec8fc882
Change ReadyToUse for Available
2019-07-06 15:06:22 +02:00
922a8c743a
Fix last commit changes
2019-07-02 10:42:56 +02:00
f40f7187de
Add Camera, LOTS project temporal devices
2019-07-01 20:39:32 +02:00
c92d6b3282
Merge branch 'rate' into devel
2019-07-01 11:31:18 +02:00
ad1781b9ec
Set version, variant, sku as CIText
2019-07-01 11:30:48 +02:00
7e8c36ab3e
Snyc with new Workbench models; fix SSL bug
2019-06-29 16:26:14 +02:00
3d6fef9927
change comments to comply with the standard PEP 257
2019-06-19 13:35:26 +02:00
61f4c127d4
Change event to action complying with schema.org
2019-05-11 16:27:22 +02:00
0dc8ced255
Sort events by default using end_time
2019-05-10 18:00:38 +02:00
16d00256df
Review rate changes
2019-05-08 19:12:05 +02:00
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
92be9c1aa1
Add fields in display and device; add battery, measureBattery
2019-05-03 14:31:49 +02:00
880b5e706e
refactor score to new rate version structure
2019-04-23 21:27:31 +02:00
8f4231dc1c
Merge branch 'master' into rate
...
# Conflicts:
# ereuse_devicehub/resources/event/models.py
2019-04-10 11:20:54 +02:00
e47748563e
Update docs
2019-03-26 10:55:38 +01:00
40a2ed3916
first iteration new rate v2
2019-03-13 13:06:58 +01:00
a7b2c056ac
Adding more mobile characteristics [Ratev2]
2019-03-10 20:44:10 +01:00
13ffab7022
Move export to Documents
2019-02-28 18:21:24 +01:00
208814ecf2
Merge branch 'master' into reports
...
# Conflicts:
# ereuse_devicehub/resources/device/views.py
# tests/test_rate_workbench_v1.py
# tests/test_workbench.py
2019-02-28 17:31:18 +01:00
6c4c89ac48
Use Postgres 11; enhance search query with websearch; really use indexes, add hash index; fix partially patching lots
2019-02-07 13:47:42 +01:00
04358a5506
Fix incorrect rate query
2019-02-05 17:59:15 +01:00
198a89a0b1
Add sphinx extension dhclass; generate better API docs; remove cache for lots
2019-02-03 17:12:53 +01:00
d2160b9db5
Add cache; bugfixing
2019-01-29 16:29:08 +01:00
74860be347
Add things_response; create tags through ereuse Tag
2019-01-26 12:49:31 +01:00
9272674760
Add inventories
2019-01-21 16:08:55 +01:00
5fb1471d9b
Use type for HID
2019-01-02 17:52:43 +01:00
710432ef12
Making API more uniform
2018-12-30 12:43:29 +01:00
1bc290dc21
Add soundcard to .pyi
2018-11-21 16:09:56 +01:00
d5a71a7678
Add document resource and erase certificate
2018-11-21 14:26:56 +01:00
b59721707d
Fix test_snapshot_different_properties_same_tags
2018-11-17 20:21:11 +01:00
91beed87ee
Working Price; working test mobile with imei; update manual rate test
2018-11-17 19:22:41 +01:00
3e636ea2c9
fix reports test and fixtures
2018-11-13 17:58:26 +01:00
ee231aecb9
Merge remote-tracking branch 'origin/master' into reports
...
# Conflicts:
# ereuse_devicehub/resources/device/views.py
2018-11-13 16:58:47 +01:00
560e0ed8dc
Add docstrings to event models; remove redundant generic test
2018-11-12 18:15:24 +01:00
Cayo Puigdefabregas
nad
fedjo
yiorgos marinellis
Big Lebowski
emmdim
jordi.nadeu
Xavier Bustamante Talavera