Commit graph

2246 commits

Author SHA1 Message Date
Cayo Puigdefabregas cdf180cf38 drop metrics of devices list 2022-06-17 12:16:01 +02:00
cayop f86df91862
Merge pull request #301 from eReuse/feature/2972-add-logo-to-label
Feature/2972 add logo to label
2022-06-09 17:14:13 +02:00
Cayo Puigdefabregas dadfbdd605 add logo in printing pdf label 2022-06-09 16:57:15 +02:00
Cayo Puigdefabregas 3431bed49e managment save and load logo in template 2022-06-08 15:37:49 +02:00
Cayo Puigdefabregas c3fbc8a0c0 Merge branch 'testing' into feature/2972-add-logo-to-label 2022-06-08 12:27:06 +02:00
Cayo Puigdefabregas 328d417741 add upload logo in template 2022-06-08 12:26:47 +02:00
cayop cfe7639734
Merge pull request #300 from eReuse/change/2973-sid-in-label
Change/2973 sid in label
2022-06-08 12:18:42 +02:00
Cayo Puigdefabregas a65e93b470 add sid in template 2022-06-08 11:59:47 +02:00
Cayo Puigdefabregas dd68c5c410 fix dev.sid 2022-06-08 11:59:22 +02:00
cayop 00a2f47189
Merge pull request #299 from eReuse/feature/3426-shift-select
select with shift
2022-06-08 10:57:00 +02:00
Lint Action 8dbb4e6e9b Fix code style issues with ESLint 2022-06-08 08:56:46 +00:00
Cayo Puigdefabregas 2eab043f3c fix var 2022-06-08 10:55:52 +02:00
Cayo Puigdefabregas a1450f9810 fix var 2022-06-08 10:53:40 +02:00
Cayo Puigdefabregas 3997235e09 fix var 2022-06-08 10:52:52 +02:00
Santiago L 9516a666e5 Add issue and pull request template 2022-06-08 10:46:31 +02:00
Lint Action 42df98f7a2 Fix code style issues with ESLint 2022-06-08 08:17:46 +00:00
Cayo Puigdefabregas 070771c077 select with shift chromium 2022-06-08 10:16:15 +02:00
Cayo Puigdefabregas 5932213764 save sid in html label 2022-06-08 09:26:09 +02:00
cayop 92fafa2358
Merge pull request #298 from eReuse/bugfix/issues-297
Bugfix/issues 297
2022-06-07 15:43:04 +02:00
Cayo Puigdefabregas 99d0a61e87 return jwt.encode to snapshot code 2022-06-07 15:24:45 +02:00
Cayo Puigdefabregas eb66baf842 fix snapshot_uuid == None 2022-06-07 15:12:13 +02:00
Cayo Puigdefabregas 74f9b88ece preload SnapshotsLog in dummy 2022-06-07 15:06:18 +02:00
Cayo Puigdefabregas 7a0e21d682 dialects.postgresql.ENUM instead of sa.Enum 2022-06-07 15:05:39 +02:00
Santiago L 498ce6763d Release version 2.2.0rc1 2022-06-07 11:22:40 +02:00
Santiago L c84c63d05c
Merge pull request #296 from eReuse/changes/changelog
change order of changelog
2022-06-07 11:16:37 +02:00
Santiago L 523c832e10 Fix typo. 2022-06-07 11:16:20 +02:00
Cayo Puigdefabregas fa72c3aa13 change order of changelog 2022-06-07 11:03:12 +02:00
Santiago L 083e763b25
Merge pull request #212 from eReuse/feature/server-side-render-parser-3021
Feature/server side render parser 3021
2022-06-07 11:00:27 +02:00
cayop 39ac37fa5e
Merge pull request #294 from eReuse/changes/changelog
update README and CHANGELOG
2022-06-07 10:11:35 +02:00
Cayo Puigdefabregas e30c7d0533 update README and CHANGELOG 2022-06-07 10:09:47 +02:00
cayop 65d500c87d
Merge pull request #293 from eReuse/feature/3428-Increase-items-selected
increase 50 and 100 items per page
2022-06-07 09:35:30 +02:00
Cayo Puigdefabregas c615980535 increase 50 and 100 items per page 2022-06-06 18:25:56 +02:00
Santiago L 772d527ba6
Merge pull request #277 from RubenPX/add-developement-stuff-js
Add developement build & precomit build (javascript)
2022-06-06 16:45:10 +02:00
cayop 1297766577
Merge pull request #292 from eReuse/feature/3416-transaction-notes
Feature/3416 transaction notes
2022-06-06 13:57:35 +02:00
Cayo Puigdefabregas 03a18df080 add tests for notes 2022-06-06 13:38:22 +02:00
Cayo Puigdefabregas 83bdf79514 add render views for delivery and receiver notes 2022-06-06 13:37:58 +02:00
Cayo Puigdefabregas e635abdbbc views of delivery note and receiver note 2022-06-03 20:01:13 +02:00
Cayo Puigdefabregas 2b8e7232c3 add transfer note models 2022-06-03 13:13:50 +02:00
Cayo Puigdefabregas 88a0bdd44d resolv conflicts 2022-06-03 11:34:49 +02:00
Cayo Puigdefabregas 26f27127b8 fixed test errors 2022-06-03 11:18:07 +02:00
cayop d7023a9496
Merge pull request #291 from eReuse/feature/3462-snapshotlog-old-api
add snapshotLog in old api
2022-06-03 11:09:09 +02:00
Cayo Puigdefabregas ad7848edc6 add snapshotLog in old api 2022-06-03 11:06:49 +02:00
cayop 9eb02e82a3
Merge pull request #290 from eReuse/feature/3436-search-bulk-dhid
add view for advanced search
2022-06-02 14:59:56 +02:00
Cayo Puigdefabregas 7ea93b58f6 fix basic test 2022-06-02 14:09:21 +02:00
Cayo Puigdefabregas cce7dbfdf1 add view for advanced search 2022-06-02 13:46:10 +02:00
Santiago L 6745dbbf7c
Merge pull request #282 from eReuse/dependabot/pip/pyjwt-2.4.0
Bump pyjwt from 2.0.0a1 to 2.4.0
2022-06-02 13:30:45 +02:00
Santiago L 560920c85a
Merge pull request #287 from RubenPX/fix/lots-button-out-of-card
fix apply button out of card
2022-06-02 13:26:05 +02:00
Santiago L 78f9c269a8
Merge pull request #285 from RubenPX/fix/lots-search
hotfix lots search not working
2022-06-02 13:25:34 +02:00
Cayo Puigdefabregas 5fc3056907 fix version transfer migration 2022-06-01 16:47:40 +02:00
Cayo Puigdefabregas 29ef48c5b2 fixing actions in tests 2022-06-01 15:54:09 +02:00