Commit graph

879 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
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 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 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 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 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 a73dee8992 add test for liink and unlink device to one tag 2021-03-01 18:55:44 +01:00
Cayo Puigdefabregas b811e0572c delete tags named 2021-03-01 17:56:55 +01:00
Cayo Puigdefabregas b2859781f0 new tests and fixing others 2021-02-26 18:59:57 +01:00
Cayo Puigdefabregas adcb330b87 fixing same tag 2 users get with a validate user 2021-02-26 18:59:32 +01:00
Cayo Puigdefabregas 8d6e50ece9 fixing unique secondary and owner 2021-02-26 18:58:10 +01:00
Cayo Puigdefabregas ac032c7902 fixing primary keys 2021-02-26 13:25:21 +01:00
Cayo Puigdefabregas 159eab29c2 restrict to named tags 2021-02-26 13:23:50 +01:00
Cayo Puigdefabregas 3931d2456f add endpoint for deassociate tags of devices 2021-02-26 11:29:17 +01:00
Cayo Puigdefabregas 689d0c48c8 change the model of tags from org to user 2021-02-26 11:28:32 +01:00
Cayo Puigdefabregas aa33688382 fixed 2 bugs 2021-02-24 23:22:36 +01:00
Cayo Puigdefabregas 929ad8e2e9 . 2021-02-24 20:18:13 +01:00
cayop 2115f53f54
Merge pull request #125 from eReuse/feature/#123-internal-stats
fixing internal stats
2021-02-23 17:50:34 +01:00
Cayo Puigdefabregas 4c08f65218 fixing internal stats 2021-02-23 17:40:36 +01:00
cayop 684e90ae56
Merge pull request #124 from eReuse/feature/#123-internal-stats
basic endpoint for internal stats
2021-02-23 12:34:35 +01:00
Cayo Puigdefabregas 79902ee26d adding lives action to the document of internal stats 2021-02-23 12:23:07 +01:00
Cayo Puigdefabregas e85b40c90f Fixing test stock 2021-02-22 22:08:14 +01:00
Cayo Puigdefabregas 2a38070ae0 prepare auth for internal stats 2021-02-22 21:18:25 +01:00
Cayo Puigdefabregas 7552839f9c updating test for internal stats 2021-02-22 21:17:07 +01:00
Cayo Puigdefabregas 30005e1f91 remove pdbs 2021-02-22 21:16:32 +01:00
Cayo Puigdefabregas d956271908 adding EMAIL_ADMIN to test config 2021-02-22 21:15:25 +01:00