Commit graph

1051 commits

Author SHA1 Message Date
Cayo Puigdefabregas 5df9c46f43 fixing shema and model 2021-04-03 15:09:35 +02:00
Cayo Puigdefabregas bbc22f4a53 Merge branch 'testing' into feature/trade-without-from 2021-04-03 15:02:06 +02:00
Cayo Puigdefabregas 47dd5b24d8 change offer-trade for 2192 aproach 2021-04-03 13:33:56 +02:00
Cayo Puigdefabregas 83eeace6fa fixing migrations 2021-03-26 17:58:05 +01:00
Cayo Puigdefabregas 8f1eee0e89 fixing url to device 2021-03-26 17:57:45 +01:00
Cayo Puigdefabregas ee55020f3c resolve conflict 2021-03-26 11:04:04 +01:00
cayop a2da7f37d9
Merge pull request #127 from eReuse/feature/#126-named-system-tags
Feature/#126 named system tags
2021-03-25 11:51:03 +01:00
Cayo Puigdefabregas 335c53530e fixing test 2021-03-25 11:39:52 +01:00
Cayo Puigdefabregas 45b44ce17b fixing tests 2021-03-25 11:26:30 +01:00
Cayo Puigdefabregas 4a16091b04 Merge branch 'testing' into feature/#126-named-system-tags 2021-03-24 14:19:59 +01:00
Cayo Puigdefabregas e884ced4d1 try define offer 2021-03-24 14:17:18 +01:00
Cayo Puigdefabregas edf3700fde Adding Offer action 2021-03-19 11:53:04 +01:00
Cayo Puigdefabregas a66ddc8390 bugfix trade action 2021-03-18 16:36:19 +01:00
Cayo Puigdefabregas acbc252fe8 new version of trade 2021-03-18 10:59:38 +01:00
Cayo Puigdefabregas 9bd787c924 change test 2021-03-18 10:59:09 +01:00
Cayo Puigdefabregas 5cd140296f test_trade 2021-03-17 18:17:43 +01:00
Cayo Puigdefabregas 0706aab3b7 test for a simple trade 2021-03-17 10:44:58 +01:00
Cayo Puigdefabregas 361c4946fe fixing migrations 2021-03-16 21:43:57 +01:00
Cayo Puigdefabregas 34aeae9908 fixing models 2021-03-16 21:39:17 +01:00
Cayo Puigdefabregas 4cbe28d591 fixing comment 2021-03-16 20:55:07 +01:00
Cayo Puigdefabregas 2ee71def75 clean pdbs 2021-03-16 20:53:54 +01:00
Cayo Puigdefabregas b13d8e5b97 fixing merge 2021-03-16 20:50:57 +01:00
Cayo Puigdefabregas 10733f8889 fixing test unamed 2021-03-16 20:05:08 +01:00
Cayo Puigdefabregas f9281fbdc0 Merge branch 'testing' into feature/#126-named-system-tags 2021-03-16 20:01:55 +01:00
cayop cf2f969b72
Merge pull request #122 from eReuse/feature/#121-check-stamps
Feature/#121 check stamps
2021-03-16 20:00:58 +01:00
Cayo Puigdefabregas b309cf5da9 update Changelog 2021-03-16 19:53:10 +01:00
Cayo Puigdefabregas 4d01e7f05d fixing bug unamed in csv 2021-03-16 15:43:42 +01:00
Cayo Puigdefabregas d7e50be052 models of new trade 2021-03-16 14:31:38 +01:00
Cayo Puigdefabregas 2b60af8b08 fixing tests and property url of device 2021-03-09 12:54:57 +01:00
Cayo Puigdefabregas b83563e0ea swap SystemID for DevicehubID 2021-03-08 22:43:24 +01:00
Cayo Puigdefabregas 840674e83b devicehubID instead of code 2021-03-08 19:09:12 +01:00
Cayo Puigdefabregas ff964bfe0a fixing path to hashcode 2021-03-08 13:22:37 +01:00
Cayo Puigdefabregas b902ab24f8 accept all type of docs 2021-03-08 13:19:35 +01:00
Cayo Puigdefabregas 2175987c85 hashcode insted of hascode 2021-03-08 13:09:01 +01:00
Cayo Puigdefabregas 06dfb9e31e adding hashcode 2021-03-08 13:06:07 +01:00
Cayo Puigdefabregas f331128741 adding TagCode to tag named system 2021-03-08 12:39:17 +01:00
Cayo Puigdefabregas 0d7a098ac5 adding sequence internal_id 2021-03-05 11:31:47 +01:00
Cayo Puigdefabregas 3a4410a4ce upgrade actual datas in migration 2021-03-04 20:42:50 +01:00
Cayo Puigdefabregas 083ce4e660 show code in web 2021-03-04 19:24:05 +01:00
Cayo Puigdefabregas bf5cae5f96 adding the create code function from ids of devices 2021-03-04 13:27:29 +01:00
Cayo Puigdefabregas 6bb608b1a6 resolve confict 2021-03-04 10:51:20 +01:00
Cayo Puigdefabregas 372427375d correct response for every stamp check 2021-03-04 10:38:04 +01:00
Cayo Puigdefabregas 41cadcc0b3 try execute create_code 2021-03-04 10:19:31 +01:00
Cayo Puigdefabregas 269550270f add code in device and add listener 2021-03-03 20:05:48 +01:00
Cayo Puigdefabregas e58b08e12c add code in migrations 2021-03-03 20:04:57 +01:00
Cayo Puigdefabregas f148a42da1 base of migration 2021-03-03 10:39:40 +01:00
Cayo Puigdefabregas 7dc88369a4 adding logout in test_base 2021-03-02 21:53:15 +01:00
Cayo Puigdefabregas 7e541f13a1 change env file name 2021-03-02 21:27:14 +01:00
Cayo Puigdefabregas 8f3c9c33cb adding the correct vars to env 2021-03-02 17:11:34 +01:00
Cayo Puigdefabregas f9ef240749 adding endpoint to test_basic 2021-03-02 11:46:13 +01:00