Commit graph

2920 commits

Author SHA1 Message Date
Cayo Puigdefabregas 2e31af4dfa Merge branch 'testing' into changes/3861-setup 2022-10-17 09:36:53 +02:00
cayop fa990fe050
Merge pull request #382 from eReuse/features/3858-storage-management
fix template device list
2022-10-14 17:02:34 +02:00
Cayo Puigdefabregas c9a3dbf6c6 fix template device list 2022-10-14 16:39:38 +02:00
cayop 99dfe40984
Merge pull request #381 from eReuse/features/3858-storage-management
Features/3858 storage management
2022-10-14 16:05:15 +02:00
Cayo Puigdefabregas a54942a8a8 add kangaroo form 2022-10-14 15:47:54 +02:00
Cayo Puigdefabregas ce09de4133 add tests 2022-10-14 15:33:43 +02:00
Cayo Puigdefabregas 6b173de5a8 setup kangaroo server 2022-10-13 18:21:44 +02:00
cayop 14a4e2f868
Merge pull request #380 from eReuse/bugfix/3833-print-label
fix layout print label
2022-10-11 18:23:09 +02:00
Cayo Puigdefabregas 5819154c5a fix layout print label 2022-10-11 18:04:25 +02:00
Cayo Puigdefabregas c8c542189a drop comments 2022-10-11 16:01:35 +02:00
Cayo Puigdefabregas b77d7abaa4 layout settings 2022-10-11 16:00:38 +02:00
Cayo Puigdefabregas b66871e9c2 first step for layout new settings 2022-10-10 17:44:20 +02:00
cayop 3914e72463
Merge pull request #379 from eReuse/changes/3925-datatime-representation
change representation data times
2022-10-10 13:50:31 +02:00
Cayo Puigdefabregas 9e41555a2f change representation data times 2022-10-10 13:24:31 +02:00
cayop 5d5a52376b
Merge pull request #378 from eReuse/feature/3854-new-button-transfer
Feature/3854 new button transfer
2022-10-10 13:10:38 +02:00
Cayo Puigdefabregas 0a657a3b45 fix tests transfer 2022-10-10 11:10:39 +02:00
Cayo Puigdefabregas 50882ee56a 3924 redirect cancel to reffered 2022-10-10 09:08:12 +02:00
cayop 1d48515008
Merge pull request #377 from eReuse/features/3842-prefix-lots-in-device-list
add prefix to lots name in the list of devices
2022-10-06 19:13:22 +02:00
Cayo Puigdefabregas 7775208b28 add prefix to lots name in the list of devices 2022-10-06 18:47:32 +02:00
cayop fbf70aac89
Merge pull request #376 from eReuse/feature/3854-new-button-transfer
add new buttons for transfer
2022-10-06 18:25:18 +02:00
Cayo Puigdefabregas 9c45665241 fix test 2022-10-06 17:16:53 +02:00
Cayo Puigdefabregas abe3c44213 add new buttons for transfer 2022-10-06 16:56:12 +02:00
cayop b7d2c88664
Merge pull request #375 from eReuse/changes/3840-name-column
change type for type upload
2022-10-06 16:08:25 +02:00
Cayo Puigdefabregas 4b1f92573a change type for type upload 2022-10-06 16:06:14 +02:00
cayop ff2b1d3be0
Merge pull request #374 from eReuse/changes/3883-identifiers-link
move links identifier and data storage to top
2022-10-06 15:56:17 +02:00
Cayo Puigdefabregas 1cd929e06b move links identifier and data storage to top 2022-10-06 15:32:09 +02:00
cayop 72ce086625
Merge pull request #373 from eReuse/changes/3881-details-lots
Enhancement - UX Lots
2022-10-06 15:19:24 +02:00
Cayo Puigdefabregas cc105fd330 changes button documents in a transfer 2022-10-06 14:41:40 +02:00
Cayo Puigdefabregas 792cc1915f move buttons transfer, remove direction transfer 2022-10-06 14:29:40 +02:00
cayop c0d129e713
Merge pull request #372 from eReuse/changes/3880-drop-logo
remove logo
2022-10-06 09:17:15 +02:00
Cayo Puigdefabregas 3d4b74f0ca drop logo 2022-10-06 08:35:00 +02:00
Cayo Puigdefabregas 795d4a20fb up version 2022-10-05 15:05:20 +02:00
Cayo Puigdefabregas 4f1e6c28eb up version to 2.4.1 2022-10-05 14:49:09 +02:00
cayop 6bb43575b6
Merge pull request #371 from eReuse/changes/3888-phid
Changes/3888 phid
2022-10-05 14:23:24 +02:00
Cayo Puigdefabregas c97ef94101 fix tests 2022-10-05 13:45:06 +02:00
Cayo Puigdefabregas 74dde2e626 fix form new device 2022-10-05 13:44:29 +02:00
Cayo Puigdefabregas 722ee1a261 fix phid definition 2022-10-05 12:22:40 +02:00
Cayo Puigdefabregas 77d10661b3 drop phid from UploadPlaceholderForm and drop update placeholder form this form 2022-10-05 09:49:15 +02:00
Cayo Puigdefabregas 926f65e291 id internal in device details 2022-10-05 09:19:16 +02:00
Cayo Puigdefabregas 120646289c id internal when create a new placeholder, wbform 2022-10-05 09:18:42 +02:00
Cayo Puigdefabregas 02f394d81e add id_internal in placeholder model 2022-10-05 09:17:27 +02:00
Cayo Puigdefabregas 45ae96ce33 add id_internal and update phid incremental per user 2022-10-05 09:16:16 +02:00
Cayo Puigdefabregas a9d6ac22f9 mail sender 2022-09-30 19:05:10 +02:00
Cayo Puigdefabregas 9184edf9b1 add mail configs 2022-09-30 19:04:37 +02:00
Cayo Puigdefabregas 6357a15f01 fix migrations 2022-09-30 17:54:26 +02:00
cayop 42d89def9a
Merge pull request #370 from eReuse/bugfix/3859-print-labels
Bugfix/3859 print labels
2022-09-29 17:56:29 +02:00
Cayo Puigdefabregas 6726d439bf fix test render print label 2022-09-29 17:24:00 +02:00
Cayo Puigdefabregas f42ccba706 change contrib for middleware in ProfilerMiddleware 2022-09-29 16:58:30 +02:00
Cayo Puigdefabregas df2dd396ee Merge branch 'testing' into bugfix/3859-print-labels 2022-09-29 13:40:11 +02:00
Santiago L 29f716ab76
Merge pull request #365 from eReuse/dependencies/pip-tools
Manage dependencies using pip-tools
2022-09-29 13:18:27 +02:00