Cayo Puigdefabregas
|
31de27769d
|
Merge branch 'testing' into feature/new-metrix
|
2021-10-18 11:53:05 +02:00 |
|
Cayo Puigdefabregas
|
5ec005e63b
|
resolve conflict
|
2021-10-18 11:47:55 +02:00 |
cayop
|
3e0e1c5716
|
Merge pull request #167 from eReuse/feature/new-recycling-action
Feature/new recycling action
|
2021-10-18 11:41:47 +02:00 |
|
Cayo Puigdefabregas
|
715c87a04c
|
CHANGELOG.md
|
2021-10-18 11:22:31 +02:00 |
|
Cayo Puigdefabregas
|
2d37baca8d
|
fixing minor changes of review
|
2021-10-18 11:20:05 +02:00 |
|
Cayo Puigdefabregas
|
0eed8330ce
|
adding metrics for documents
|
2021-10-15 15:04:58 +02:00 |
|
Cayo Puigdefabregas
|
17f8aebb94
|
fixing rows
|
2021-10-14 18:13:20 +02:00 |
|
Cayo Puigdefabregas
|
5e9b9bf08d
|
new metrics
|
2021-10-14 12:56:33 +02:00 |
|
Cayo Puigdefabregas
|
aa7a3ffe12
|
Merge branch 'feature/new-recycling-action' into feature/new-metrix
|
2021-10-11 14:11:59 +02:00 |
|
Cayo Puigdefabregas
|
35e891bf5d
|
trace in metrics
|
2021-10-11 14:11:56 +02:00 |
|
Cayo Puigdefabregas
|
cae0ca8711
|
changelog
|
2021-10-06 12:52:04 +02:00 |
|
Cayo Puigdefabregas
|
007e9a96c6
|
Merge branch 'testing' into feature/new-recycling-action
|
2021-10-06 12:49:42 +02:00 |
|
Cayo Puigdefabregas
|
09a106e446
|
resolve conflict
|
2021-10-06 12:49:10 +02:00 |
|
Cayo Puigdefabregas
|
406d3d6449
|
changelog
|
2021-10-06 12:48:03 +02:00 |
|
Cayo Puigdefabregas
|
8a7e7049a5
|
change changelog
|
2021-10-06 12:44:59 +02:00 |
|
Cayo Puigdefabregas
|
fbf74643e9
|
resolve conflict
|
2021-10-06 12:11:05 +02:00 |
|
Cayo Puigdefabregas
|
2e564862e8
|
excluding when it is in one trade action
|
2021-10-06 11:53:41 +02:00 |
|
Cayo Puigdefabregas
|
03cfbfaa35
|
fixing model action device
|
2021-10-06 10:51:53 +02:00 |
|
Cayo Puigdefabregas
|
aa4ebeb504
|
fixing, vanish deactivate devices
|
2021-10-05 14:33:28 +02:00 |
|
Cayo Puigdefabregas
|
9ea0a05de6
|
migration file
|
2021-10-05 14:00:55 +02:00 |
|
Cayo Puigdefabregas
|
7eff54f86a
|
fixing base test
|
2021-10-05 12:19:23 +02:00 |
|
Cayo Puigdefabregas
|
6dd54d9645
|
deactivate devices
|
2021-10-05 12:17:07 +02:00 |
|
Cayo Puigdefabregas
|
ec2d286ed3
|
adding action delete
|
2021-10-05 11:56:19 +02:00 |
|
Cayo Puigdefabregas
|
dc3b9ebf2d
|
fixing test
|
2021-10-05 11:55:43 +02:00 |
|
Cayo Puigdefabregas
|
83c4cc2d8b
|
test of delete devices
|
2021-10-05 09:56:57 +02:00 |
|
cayop
|
97176879f5
|
Merge pull request #169 from eReuse/bugfix/#168
Bugfix/#168
|
2021-10-04 13:50:58 +02:00 |
|
Cayo Puigdefabregas
|
ab74240d6c
|
fixing 3 bugs, #168
|
2021-10-04 13:35:51 +02:00 |
|
Cayo Puigdefabregas
|
b02f9dfac5
|
fixing test bug #168
|
2021-10-04 13:34:49 +02:00 |
|
Cayo Puigdefabregas
|
b83bbe25a0
|
test bug 168
|
2021-10-01 18:01:39 +02:00 |
|
Cayo Puigdefabregas
|
920937a51f
|
fixing bug of trade without devices
|
2021-10-01 13:30:39 +02:00 |
|
Cayo Puigdefabregas
|
2d305f5a43
|
adding trade without devices
|
2021-10-01 13:18:56 +02:00 |
|
Cayo Puigdefabregas
|
2790a7756c
|
test action trade without devices and documents
|
2021-10-01 12:56:12 +02:00 |
|
Cayo Puigdefabregas
|
7a43eaa30f
|
fixing name reuse in test
|
2021-10-01 11:42:31 +02:00 |
|
Cayo Puigdefabregas
|
e30c6c2250
|
fixing test
|
2021-10-01 11:26:56 +02:00 |
|
Cayo Puigdefabregas
|
6599f4b66c
|
fixing bug
|
2021-10-01 10:46:08 +02:00 |
|
Cayo Puigdefabregas
|
eeb6db7bc2
|
test for recycling documents
|
2021-09-29 21:12:46 +02:00 |
|
Cayo Puigdefabregas
|
7e4af161d3
|
solve conflict
|
2021-09-29 14:13:42 +02:00 |
|
Cayo Puigdefabregas
|
aff86a8f94
|
using ActionWithMultipleTradeDocuments intead of ActionWithMultipleDevices
|
2021-09-29 12:59:44 +02:00 |
|
cayop
|
baa5fccda0
|
Merge pull request #163 from eReuse/feature/container
Feature/container
|
2021-09-29 12:58:01 +02:00 |
|
Cayo Puigdefabregas
|
2828c0755a
|
adding test for check if you are not the owner
|
2021-09-29 11:04:56 +02:00 |
|
Cayo Puigdefabregas
|
88780d4949
|
adding test for history and status calls
|
2021-09-28 15:44:56 +02:00 |
|
Cayo Puigdefabregas
|
84da94430e
|
fixing bug
|
2021-09-28 15:44:25 +02:00 |
|
Cayo Puigdefabregas
|
f10f2b848f
|
get the status and history status of one devices
|
2021-09-28 13:05:58 +02:00 |
|
Cayo Puigdefabregas
|
4ce316a9ac
|
fixing tests status actions
|
2021-09-28 11:25:57 +02:00 |
|
Cayo Puigdefabregas
|
38db59b150
|
put the correct user un rol_user
|
2021-09-27 14:58:25 +02:00 |
|
Cayo Puigdefabregas
|
c2b0e6341f
|
adding new models for Use, Recycling, Refurbish and Management actions
|
2021-09-24 12:37:33 +02:00 |
|
Cayo Puigdefabregas
|
e861ae3bf8
|
adding tests for recycling and reuse
|
2021-09-22 14:33:46 +02:00 |
|
Cayo Puigdefabregas
|
b195e380a9
|
adding basic action reuse and recycling
|
2021-09-22 14:01:49 +02:00 |
|
cayop
|
4adcff0d6e
|
Merge pull request #165 from eReuse/changes/dhid
adding dhid
|
2021-09-22 12:28:25 +02:00 |
|
Cayo Puigdefabregas
|
23cb5a2bf6
|
fixing test
|
2021-09-22 12:18:10 +02:00 |