Commit Graph

1328 Commits

Author SHA1 Message Date
Cayo Puigdefabregas f06007e199 fixing conflict 2021-11-08 18:07:07 +01:00
cayop ec0829faf2
Merge pull request #178 from eReuse/feature/new-metrix
Feature/new metrix
2021-11-08 18:00:12 +01:00
Cayo Puigdefabregas c7ced04e9d fixing bug for documents 2021-11-08 17:33:22 +01:00
Cayo Puigdefabregas f8be48d524 fixing schema 2021-11-05 13:10:23 +01:00
Cayo Puigdefabregas 6bf1354109 fixing change status next trade 2021-11-05 13:00:01 +01:00
Cayo Puigdefabregas 5ebf4f48b5 adding trade in status actions 2021-11-05 12:35:10 +01:00
Cayo Puigdefabregas 56df40c81a fixing actions for computer 2021-11-04 13:27:25 +01:00
Cayo Puigdefabregas 6de83ce4d2 Fixing order of actions_multiple devices 2021-11-04 11:58:15 +01:00
Cayo Puigdefabregas b233b7bb75 fixed 2021-11-03 10:37:15 +01:00
Cayo Puigdefabregas 34def7bd70 fixint trading fuction 2021-11-02 14:25:49 +01:00
Cayo Puigdefabregas c34cbb5c26 fixing metrics 2021-11-02 12:47:23 +01:00
Cayo Puigdefabregas 283f869b4d drop remove 2021-10-28 12:19:49 +02:00
Cayo Puigdefabregas 03238acb9f fixing session in listener 2021-10-26 16:35:41 +02:00
Cayo Puigdefabregas 5861d2fd6f fixing session in listener 2021-10-26 16:21:05 +02:00
cayop 7d7b948f8b
Merge pull request #176 from eReuse/feature/new-metrix
Feature/new metrix
2021-10-25 13:41:54 +02:00
Cayo Puigdefabregas 5cce2f4efb change some sintaxis 2021-10-25 13:24:22 +02:00
Cayo Puigdefabregas 15fa4546d1 fixing general case for devices 2021-10-25 12:20:16 +02:00
Cayo Puigdefabregas 118825ed77 testing bug confirmed in metrics 2021-10-25 10:43:28 +02:00
cayop 12102d8890
Merge pull request #175 from eReuse/feature/generate-name-tag
adding tag when there are a new device
2021-10-23 15:22:39 +02:00
Cayo Puigdefabregas 3531f607da fixing other orther of tags 2021-10-23 15:01:50 +02:00
Cayo Puigdefabregas 2dd1a3cfd5 fixed random tag order 2021-10-23 14:44:09 +02:00
Cayo Puigdefabregas 0b8304b729 fixing test 2021-10-23 14:02:49 +02:00
Cayo Puigdefabregas 7ef31a3ba3 fixing tests 2021-10-23 13:41:26 +02:00
Cayo Puigdefabregas 1c2f6ba92c fixing tests 2021-10-23 13:02:10 +02:00
Cayo Puigdefabregas 1bfb80de52 fixing tests 2021-10-22 22:34:32 +02:00
Cayo Puigdefabregas 9faa1697a7 fixing event device 2021-10-22 21:14:10 +02:00
Cayo Puigdefabregas 6091f31c17 adding event instead of reuse create_code function 2021-10-22 19:26:27 +02:00
Cayo Puigdefabregas 2ade5a14d4 adding tag when there are a new device 2021-10-22 14:19:42 +02:00
cayop 9972c1666f
Merge pull request #173 from eReuse/feature/new-metrix
Feature/new metrix
2021-10-20 15:08:01 +02:00
Cayo Puigdefabregas 7c6b20597b fixing supplier permitions 2021-10-20 14:53:33 +02:00
Cayo Puigdefabregas f099a579fb fixing rows 2021-10-19 19:25:17 +02:00
Cayo Puigdefabregas 87f30a1391 adding metrics for tradeDocuments 2021-10-19 18:19:25 +02:00
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