Cayo Puigdefabregas
|
4157aa8273
|
adding test of active and phantom login
|
2021-04-09 20:10:52 +02:00 |
|
Cayo Puigdefabregas
|
eae5422d42
|
resolve conflict
|
2021-04-09 14:57:26 +02:00 |
|
cayop
|
9d4e0d934e
|
Merge pull request #134 from eReuse/bugfix/dummy
fixing for todo trade pr
|
2021-04-09 14:54:27 +02:00 |
|
Cayo Puigdefabregas
|
c5ef11e670
|
fixing for todo trade pr
|
2021-04-09 14:43:20 +02:00 |
|
Cayo Puigdefabregas
|
2ab9afa1e4
|
fixing migration
|
2021-04-08 21:31:50 +02:00 |
|
Cayo Puigdefabregas
|
e88a508efb
|
create correct migrations
|
2021-04-08 21:22:10 +02:00 |
|
Cayo Puigdefabregas
|
b80322355f
|
create automatic trade and creation of phantom account in the view
|
2021-04-08 21:21:29 +02:00 |
|
Cayo Puigdefabregas
|
f7f60f6988
|
remove pdbs
|
2021-04-08 21:20:14 +02:00 |
|
Cayo Puigdefabregas
|
17a744a660
|
add filter active and phantom for login view
|
2021-04-08 21:19:24 +02:00 |
|
Cayo Puigdefabregas
|
9a43ab0097
|
add new columns in user model, (active and phantom fields)
|
2021-04-08 19:13:28 +02:00 |
|
Cayo Puigdefabregas
|
a9ec5de237
|
do a better check from schema
|
2021-04-08 19:11:27 +02:00 |
|
Cayo Puigdefabregas
|
ac5b55d04a
|
new trade tests
|
2021-04-08 19:10:08 +02:00 |
|
Cayo Puigdefabregas
|
054f59453d
|
fixing tests
|
2021-04-08 19:09:52 +02:00 |
|
Cayo Puigdefabregas
|
6fde0cabc6
|
change offer with new requirements
|
2021-04-07 10:49:28 +02:00 |
|
Cayo Puigdefabregas
|
9a48ea09a4
|
test offers
|
2021-04-07 10:49:05 +02:00 |
|
Cayo Puigdefabregas
|
84fac3f04a
|
fixing schema offer
|
2021-04-03 17:47:30 +02:00 |
|
Cayo Puigdefabregas
|
1d6e0c9588
|
fixing test offer
|
2021-04-03 17:46:40 +02:00 |
|
Cayo Puigdefabregas
|
98daa0e3ad
|
fixing enum currency in migration
|
2021-04-03 17:46:16 +02:00 |
|
Cayo Puigdefabregas
|
799c2a49bc
|
fixing migration
|
2021-04-03 15:09:53 +02:00 |
|
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 |
|