Cayo Puigdefabregas
729281383e
resolve conflicts
2020-12-10 10:30:50 +01:00
Cayo Puigdefabregas
2c67e3be93
resolve conflict
2020-12-09 12:32:00 +01:00
Cayo Puigdefabregas
eaa20b4302
fixing conflict merge with testing
2020-12-09 11:12:47 +01:00
Cayo Puigdefabregas
7e41c66073
implementing the warnings and unnormal cases
2020-12-04 16:58:53 +01:00
Cayo Puigdefabregas
05c81382f2
change comment of allocated
2020-12-01 15:55:21 +01:00
Cayo Puigdefabregas
4172711c93
change the endpoints for allocate and deallocate
2020-11-27 18:10:51 +01:00
Cayo Puigdefabregas
ef563e3595
resolve confict
2020-11-25 19:09:24 +01:00
Cayo Puigdefabregas
0c1e5b8307
changes from review
2020-11-25 18:42:36 +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
0ab8a36832
bugfix with none in the mac serial
2020-11-13 11:05:00 +01:00
Cayo Puigdefabregas
791308d8e8
modify hid when create the snapshot
2020-11-12 21:00:07 +01:00
Cayo Puigdefabregas
82a3344965
centralized in one point the hid
2020-11-12 20:57:33 +01:00
Cayo Puigdefabregas
554ec254d8
identation problem
2020-11-11 16:59:30 +01:00
Cayo Puigdefabregas
17f1ff98e7
adding update hid when insert one manual or automatic snapshot
2020-11-11 16:53:41 +01:00
Cayo Puigdefabregas
0a7e805f3e
clean events from device models
2020-11-11 16:52:02 +01:00
Cayo Puigdefabregas
cbe6bb7e90
adding mac of networkadapter to hid
2020-11-10 20:45:03 +01:00
Cayo Puigdefabregas
725e586e85
Merge branch 'testing' into bugfix/79-manual-merge
2020-11-09 16:11:12 +01:00
Cayo Puigdefabregas
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
Cayo Puigdefabregas
8a471c98c0
todo an automatic merge with sync only of your devices
2020-11-06 17:10:32 +01:00
Cayo Puigdefabregas
52bd6d5271
fixed similar_one for get only from your devices
2020-11-06 17:09:39 +01:00
Cayo Puigdefabregas
9b25132c29
fixed bug for use filters from the website
2020-11-04 17:30:12 +01:00
Cayo Puigdefabregas
50a7b59957
fixed bug: owner_id is not a physical property
2020-11-03 20:26:03 +01:00
Cayo Puigdefabregas
5ac1e8efba
adding manually migrate and change model of device
2020-10-30 21:08:55 +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
