cayop
|
d2c7150320
|
Merge pull request #118 from eReuse/change/#117-deactivate-merge
Change/#117 deactivate merge
|
2021-02-11 21:19:25 +01:00 |
Cayo Puigdefabregas
|
43e782e986
|
update Changelog
|
2021-02-11 21:07:29 +01:00 |
|
Cayo Puigdefabregas
|
aa5fb1d9fd
|
fixing basic tests
|
2021-02-11 21:04:18 +01:00 |
|
Cayo Puigdefabregas
|
91848a548c
|
deactivate manual merge
|
2021-02-11 20:38:18 +01:00 |
|
Cayo Puigdefabregas
|
1fff5cd32e
|
add format to numbers and remove some datas
|
2021-02-11 20:00:57 +01:00 |
|
cayop
|
a2b0d0c02f
|
Merge pull request #116 from eReuse/change/#115-monir-changes-deliverynote
Change/#115 monir changes deliverynote
|
2021-02-11 13:30:19 +01:00 |
|
Cayo Puigdefabregas
|
bf734ee534
|
fixing testing deliverynote
|
2021-02-11 13:17:52 +01:00 |
|
Cayo Puigdefabregas
|
0535a1f310
|
resolve conflict
|
2021-02-11 13:03:21 +01:00 |
|
cayop
|
fc6a3733e0
|
Merge pull request #114 from eReuse/change/#113-clean-deliverynote
Change/#113 clean deliverynote
|
2021-02-11 13:00:11 +01:00 |
|
Cayo Puigdefabregas
|
deff20afae
|
fixing migrations
|
2021-02-11 12:51:50 +01:00 |
|
Cayo Puigdefabregas
|
afa4f9ce45
|
fixing tests
|
2021-02-10 13:40:24 +01:00 |
|
Cayo Puigdefabregas
|
72466003d0
|
drop all ethereum_address in the system
|
2021-02-10 13:05:43 +01:00 |
|
Cayo Puigdefabregas
|
d24a0ca16b
|
fixing tests
|
2021-02-10 11:01:12 +01:00 |
|
Cayo Puigdefabregas
|
e34371bbc5
|
Drop Transferred action
|
2021-02-10 10:41:24 +01:00 |
|
Cayo Puigdefabregas
|
1a0287f8f9
|
adding documentId in csv of devices report
|
2021-02-07 18:16:43 +01:00 |
|
Cayo Puigdefabregas
|
f80db15506
|
change name of automatic lot of deliverynote
|
2021-02-05 15:58:39 +01:00 |
|
Cayo Puigdefabregas
|
6b7571fe86
|
change deposit for amount
|
2021-02-05 15:35:52 +01:00 |
|
Cayo Puigdefabregas
|
cb3f07eb5a
|
change deposit for amount
|
2021-02-05 13:21:20 +01:00 |
|
Cayo Puigdefabregas
|
761e70b5e6
|
simple test of deliverynote
|
2021-02-04 20:43:57 +01:00 |
|
Cayo Puigdefabregas
|
a0546e284e
|
fixed a litle bug of documentId representation
|
2021-02-04 20:42:50 +01:00 |
|
Cayo Puigdefabregas
|
2619f88a9f
|
drop all proof
|
2021-02-04 13:50:00 +01:00 |
|
Cayo Puigdefabregas
|
fe824cc4fa
|
drop deliverynote_address
|
2021-02-04 13:06:51 +01:00 |
|
Cayo Puigdefabregas
|
95f04094c7
|
fixing problem in live test2
|
2021-02-04 12:51:51 +01:00 |
|
Cayo Puigdefabregas
|
a716e95792
|
fixing problem in live test
|
2021-02-04 12:23:28 +01:00 |
|
Cayo Puigdefabregas
|
ee4bf45c72
|
restart name of lot
|
2021-02-04 11:13:55 +01:00 |
|
Cayo Puigdefabregas
|
b9f3d5976b
|
drop ethereum_address of deliverynote
|
2021-02-03 22:28:04 +01:00 |
|
Cayo Puigdefabregas
|
7a88d9d730
|
change the name of lot with documentId
|
2021-02-03 22:06:27 +01:00 |
|
cayop
|
e17652abf6
|
Merge pull request #112 from eReuse/bugfix/bug-#1862
Bugfix/bug #1862
|
2021-01-26 17:29:10 +01:00 |
|
Cayo Puigdefabregas
|
fd7920b3f9
|
fixed test
|
2021-01-26 15:35:42 +01:00 |
|
Cayo Puigdefabregas
|
6ca37e348c
|
change erasure.html template
|
2021-01-26 13:52:23 +01:00 |
|
Cayo Puigdefabregas
|
9cc82e7a82
|
return to previus state
|
2021-01-26 12:24:02 +01:00 |
|
Cayo Puigdefabregas
|
1e50386b93
|
fixed test
|
2021-01-25 16:10:23 +01:00 |
|
Cayo Puigdefabregas
|
c3b860b69c
|
test reproduce bug 1888
|
2021-01-25 15:38:09 +01:00 |
|
cayop
|
6a69234a4c
|
Merge pull request #111 from eReuse/bugfix/bug-#1860
Bugfix/bug #1860
|
2021-01-22 14:35:04 +01:00 |
|
Cayo Puigdefabregas
|
b2db917f34
|
Merge branch 'testing' into bugfix/bug-#1860
|
2021-01-22 13:20:47 +01:00 |
|
Cayo Puigdefabregas
|
47b7b4224c
|
test and fixed bug 1860
|
2021-01-22 13:19:29 +01:00 |
|
cayop
|
4b0a8adaa8
|
Merge pull request #110 from eReuse/bugfix/bug-#1998
Bugfix/bug #1998
|
2021-01-21 17:25:34 +01:00 |
|
Cayo Puigdefabregas
|
14a27a3d85
|
bug fix change smallint for integer
|
2021-01-21 17:13:36 +01:00 |
|
Cayo Puigdefabregas
|
8820395211
|
add asserts to test
|
2021-01-21 12:32:55 +01:00 |
|
Cayo Puigdefabregas
|
ff77e3b065
|
reproduce bug in a test
|
2021-01-21 12:25:38 +01:00 |
|
cayop
|
838b6b26a5
|
Merge pull request #108 from eReuse/change/change-rows
adding systemId in metrics csv
|
2021-01-20 10:47:18 +01:00 |
|
Cayo Puigdefabregas
|
5ae61d30bc
|
adding systemId in metrics csv
|
2021-01-20 10:39:02 +01:00 |
|
cayop
|
571d12e53d
|
Merge pull request #107 from eReuse/bugfix/csv_stamp
fixing bug of lifetime
|
2021-01-19 18:43:38 +01:00 |
|
Cayo Puigdefabregas
|
7f6014532d
|
fixing test
|
2021-01-19 16:31:01 +01:00 |
|
Cayo Puigdefabregas
|
f140c48359
|
fixing bug of lifetime
|
2021-01-19 16:06:46 +01:00 |
|
cayop
|
bd609a0842
|
Merge pull request #106 from eReuse/#104-page-explaining-stamp
fixing url of link
|
2021-01-18 17:34:40 +01:00 |
|
Cayo Puigdefabregas
|
a7d51655b6
|
fixing url of link
|
2021-01-18 17:18:47 +01:00 |
|
cayop
|
55a67cfd2d
|
Merge pull request #105 from eReuse/#104-page-explaining-stamp
#104 page explaining stamp
|
2021-01-18 12:59:01 +01:00 |
|
Cayo Puigdefabregas
|
0273021d50
|
fixing title page
|
2021-01-18 12:48:54 +01:00 |
|
Cayo Puigdefabregas
|
1ec1eb39bf
|
fixing test base
|
2021-01-18 12:40:31 +01:00 |