4e610f0903
resolve conflict
2023-05-23 15:28:13 +02:00
b5a77ace2f
add logout
2023-05-19 18:17:22 +02:00
7b2bfd095c
adapt client oidc
2023-05-19 17:05:02 +02:00
e649d65b5d
add validations in public page of device
2023-04-26 12:24:38 +02:00
01ef359bd4
add teal as module
2023-03-21 12:08:13 +01:00
bea63148b2
Merge pull request #426 from eReuse/feature/2078-public-page
...
add new version of public page
2023-02-01 17:16:12 +01:00
7dc3ac9530
fix test
2023-02-01 16:35:27 +01:00
6b5db31922
add new version of public page
2023-02-01 13:28:31 +01:00
236fcac0b8
add new hid in devices
2022-11-16 11:51:31 +01:00
106ab2f650
add tests and redirect from abstract device to twin page
2022-10-18 11:18:50 +02:00
c0653e51ce
redirect public link from abstract to real device
2022-08-31 10:55:49 +02:00
30f511a03a
add both device in a public page when is a twin device
2022-08-29 16:36:57 +02:00
05d1f9698c
add both device in a public page when is a twin device
2022-08-29 16:36:42 +02:00
a2b9d1c96d
drop filter only by wb device
2022-07-20 10:03:46 +02:00
31abdf55e2
show only devices wb via api
2022-07-18 17:56:54 +02:00
aa4ebeb504
fixing, vanish deactivate devices
2021-10-05 14:33:28 +02:00
6dd54d9645
deactivate devices
2021-10-05 12:17:07 +02:00
1961e3d408
rebuild query for filter devs without lots
2021-08-02 18:17:08 +02:00
6dc7fb830b
fixing bug of filter devices
2021-06-06 10:02:24 +02:00
e4554a9e27
use open filter for checke frontend trade
2021-06-02 15:33:03 +02:00
a65e4ffb82
fixing bug
2021-04-26 15:22:30 +02:00
b83563e0ea
swap SystemID for DevicehubID
2021-03-08 22:43:24 +01:00
72466003d0
drop all ethereum_address in the system
2021-02-10 13:05:43 +01:00
fe824cc4fa
drop deliverynote_address
2021-02-04 13:06:51 +01:00
729281383e
resolve conflicts
2020-12-10 10:30:50 +01:00
eaa20b4302
fixing conflict merge with testing
2020-12-09 11:12:47 +01:00
ef563e3595
resolve confict
2020-11-25 19:09:24 +01:00
17f1ff98e7
adding update hid when insert one manual or automatic snapshot
2020-11-11 16:53:41 +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
9b25132c29
fixed bug for use filters from the website
2020-11-04 17:30:12 +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
19279acaeb
clean view of merge
2020-10-27 19:13:31 +01: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
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
61fd9de477
Remove caching when returning lots, devices, fixes UI issue 18
2020-04-06 13:10:39 +02: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
ce961a1bed
Add MakeAvailable and Repair; add device.image; add templating file, change layout for project LOT
2019-07-07 21:36:09 +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
16d00256df
Review rate changes
2019-05-08 19:12:05 +02:00
04358a5506
Fix incorrect rate query
2019-02-05 17:59:15 +01:00
d2160b9db5
Add cache; bugfixing
2019-01-29 16:29:08 +01:00
Cayo Puigdefabregas
cayop
nad
fedjo
yiorgos marinellis
emmdim
Xavier Bustamante Talavera