Commit graph

2873 commits

Author SHA1 Message Date
cayop b77c81c16a
Merge pull request #421 from eReuse/bugfix/4206-donalo-incoming
Bugfix/4206 donalo incoming
2023-01-11 10:49:20 +01:00
Cayo Puigdefabregas a265af8864 fix remove placeholder from trade 2023-01-11 10:18:22 +01:00
Cayo Puigdefabregas f929283f4f fix trades in temporary list 2023-01-10 14:11:42 +01:00
Cayo Puigdefabregas 350aad19c4 get all lots not only temporary 2023-01-10 14:10:49 +01:00
Nadeu 8a8feb3165
Update iso 2022.12.1-beta 2022-12-23 13:53:22 +01:00
cayop 14b61cbaeb
Merge pull request #419 from eReuse/feature/3999-setings
Feature/3999 fix setings_version and template
2022-12-15 10:53:22 +01:00
Cayo Puigdefabregas 1924d7fe71 wb settins 2022-12-15 10:20:17 +01:00
Cayo Puigdefabregas 0f7c9504b0 fix settings_version 2022-12-15 10:18:22 +01:00
Cayo Puigdefabregas 30474fa7e6 Merge branch 'testing' into feature/3999-setings 2022-12-14 17:47:38 +01:00
Cayo Puigdefabregas 83d62b4cb4 Merge branch 'master' into testing 2022-12-14 17:41:55 +01:00
Cayo Puigdefabregas 63c7b29233 https instead of http 2022-12-14 17:41:35 +01:00
Cayo Puigdefabregas 254a32d989 test settings version 2022-12-12 14:20:18 +01:00
Cayo Puigdefabregas 9736ee323a test settings version 2022-12-12 14:20:07 +01:00
Cayo Puigdefabregas 534adbba75 Merge branch 'master' into testing 2022-12-05 10:35:49 +01:00
cayop 01a3a97c2b
Merge pull request #416 from eReuse/bugfix/4131-link-dhid
fix bug
2022-12-05 10:28:35 +01:00
Cayo Puigdefabregas 9a39f3ae9d fix bug 2022-12-05 10:05:12 +01:00
cayop 046a902005
Merge pull request #414 from eReuse/feature/3999-setings
Feature/3999 setings
2022-11-30 17:12:19 +01:00
Cayo Puigdefabregas a2626a0b58 add settings version to version column in snapshots log 2022-11-30 16:46:10 +01:00
Cayo Puigdefabregas 7c6290bd89 add settings version to snapshots model 2022-11-30 16:25:11 +01:00
Cayo Puigdefabregas 4fa6f9f343 Merge branch 'testing' into feature/3999-setings 2022-11-30 16:13:33 +01:00
Cayo Puigdefabregas 341a7b2034 fix bug privacity 2022-11-30 15:26:16 +01:00
Cayo Puigdefabregas fe9c2c1c2d fix bug privacity 2022-11-30 15:19:59 +01:00
cayop f1042b627b
Merge pull request #415 from eReuse/bugfix/4128-prefix-lot-search
put prefix in lots in result of search
2022-11-30 15:04:32 +01:00
Cayo Puigdefabregas 7bc4a7d387 CHANGELOG.md 2022-11-30 13:31:37 +01:00
Cayo Puigdefabregas e36f813d92 put prefix in lots in result of search 2022-11-30 13:28:17 +01:00
Cayo Puigdefabregas 7be17ead58 release 2.5.0 2022-11-30 13:10:49 +01:00
Cayo Puigdefabregas 0a6f9e3bf4 add settings_version to schema 2022-11-30 12:54:11 +01:00
Cayo Puigdefabregas 18281c95e5 remove system_uuid 2022-11-30 12:10:00 +01:00
Cayo Puigdefabregas 3f5ae9fefd change settings template 2022-11-30 11:55:32 +01:00
Cayo Puigdefabregas 785f72692a change settings template 2022-11-30 11:53:19 +01:00
cayop f49ba1f7ba
Merge pull request #413 from eReuse/bugfix/4124-documents-in-lot
fix orther without id
2022-11-30 11:27:27 +01:00
Cayo Puigdefabregas 9fbdaf5834 add test 2022-11-30 10:59:56 +01:00
Cayo Puigdefabregas b1ad7b151d fix orther without id 2022-11-30 10:23:51 +01:00
cayop 0233a2ba6b
Merge pull request #412 from eReuse/bugfix/4122-snapshots-log-type-upload
Bugfix/4122 snapshots log type upload
2022-11-29 18:35:27 +01:00
cayop 4dff032fe6
Merge pull request #411 from eReuse/feature/4094-add-new-fields
Feature/4094 add new fields
2022-11-29 18:11:55 +01:00
Cayo Puigdefabregas d2a4c0ef83 Merge branch 'testing' into bugfix/4122-snapshots-log-type-upload 2022-11-29 18:10:36 +01:00
Cayo Puigdefabregas 4be07130c2 fixed 2022-11-29 18:09:53 +01:00
Cayo Puigdefabregas 040421172f fix definition of others 2022-11-29 17:46:41 +01:00
Cayo Puigdefabregas c392270676 add others device 2022-11-29 16:49:23 +01:00
Cayo Puigdefabregas b84f379468 Merge branch 'testing' into feature/4094-add-new-fields 2022-11-29 10:09:10 +01:00
cayop b98be622e1
Merge pull request #410 from eReuse/feature/4107-search
add advanced search as top search
2022-11-28 18:34:51 +01:00
Cayo Puigdefabregas 9ee24c3e82 put simple table as cdn 2022-11-28 17:09:32 +01:00
Cayo Puigdefabregas 07f947b1ad fix search 2022-11-28 17:00:30 +01:00
Cayo Puigdefabregas 79fbe323a2 try fix 2022-11-28 16:39:43 +01:00
Cayo Puigdefabregas b39388bef0 fix 2022-11-28 15:24:31 +01:00
Cayo Puigdefabregas 994cd3c6ca Merge branch 'feature/4107-search' of github.com:eReuse/devicehub-teal into feature/4107-search 2022-11-28 15:10:29 +01:00
Cayo Puigdefabregas 9da321a925 fix 2022-11-28 15:10:12 +01:00
Lint Action 368d82c007 Fix code style issues with ESLint 2022-11-28 14:05:48 +00:00
Cayo Puigdefabregas 0b6cfb210d add advanced search as top search 2022-11-28 15:00:45 +01:00
cayop 6eb820b69d
Merge pull request #409 from eReuse/feature/4106-pagination
Feature/4106 pagination
2022-11-28 13:39:15 +01:00