Commit graph

2464 commits

Author SHA1 Message Date
Cayo Puigdefabregas 72b34b3330 resolve conflict 2022-08-02 12:58:26 +02:00
Cayo Puigdefabregas 9c2d52a7f7 fix cascade delete in placeholder 2022-08-02 12:41:31 +02:00
Cayo Puigdefabregas 8728707bf7 fix csv files 2022-08-01 20:54:26 +02:00
Cayo Puigdefabregas bee420c1e7 fix tests quotes files 2022-08-01 20:40:42 +02:00
Cayo Puigdefabregas bc339a1cd9 fix test metrics 2022-08-01 20:06:47 +02:00
Cayo Puigdefabregas b75fd6873f fix render 2022-08-01 19:38:21 +02:00
Cayo Puigdefabregas e8b06d8e16 fix render 2022-08-01 19:38:09 +02:00
Cayo Puigdefabregas 5ba879d4b5 other type of quotes 2022-08-01 19:17:21 +02:00
Cayo Puigdefabregas bfc568cd2e fix test bugs 2022-08-01 17:42:28 +02:00
Cayo Puigdefabregas 2a9b6864be resolve conflict 2022-08-01 17:23:27 +02:00
Cayo Puigdefabregas c6bbaa0460 add quotation for results of csv 2022-08-01 16:13:55 +02:00
Cayo Puigdefabregas 063d20695f add quotation for results of csv 2022-07-29 18:30:58 +02:00
Cayo Puigdefabregas 7e4deea7fe add unbinding 2022-07-29 17:02:27 +02:00
Cayo Puigdefabregas c98de60680 Merge branch 'testing' into feature/3598-binding 2022-07-29 10:05:49 +02:00
cayop 0c52598820
Merge pull request #322 from eReuse/drop-imei-form
commit validation imei for mobiles
2022-07-28 18:56:56 +02:00
Cayo Puigdefabregas 637308ee8f drop required of imei and meid 2022-07-28 18:34:34 +02:00
Cayo Puigdefabregas b0beff5b1d commit validation imei for mobiles 2022-07-28 18:12:49 +02:00
Cayo Puigdefabregas 497e29a2da add manual binding 2022-07-28 17:48:14 +02:00
Cayo Puigdefabregas d008bb2921 resolve conflicts 2022-07-25 18:16:09 +02:00
Cayo Puigdefabregas d5588bc871 Merge branch 'bugfix/3666-label' into testing 2022-07-25 18:13:52 +02:00
cayop eea6d5c7e7
Merge pull request #321 from eReuse/bugfix/3666-label
Bugfix/3666 label
2022-07-25 18:06:07 +02:00
Cayo Puigdefabregas ac9708c779 fix unlink tags 2022-07-25 17:38:08 +02:00
Cayo Puigdefabregas 31bd4d775b fix fields number for print label 2022-07-25 17:37:00 +02:00
Cayo Puigdefabregas 8bec1fbd29 Merge branch 'change/3659-weekly-report' into testing 2022-07-25 16:03:08 +02:00
cayop 5d2161c5e4
Merge pull request #319 from eReuse/change/3659-weekly-report
add report command cli
2022-07-25 16:02:57 +02:00
Cayo Puigdefabregas 21f2a9c49b fix tests 2022-07-22 17:53:09 +02:00
Cayo Puigdefabregas 429c9a1b15 add command cli: get_token 2022-07-22 17:49:51 +02:00
Cayo Puigdefabregas a74e242e20 add report command cli 2022-07-22 15:23:49 +02:00
Cayo Puigdefabregas ee49b4a2dd fix test print labels 2022-07-21 16:51:02 +02:00
Cayo Puigdefabregas 21dcb6c26d Merge branch 'testing' into feature/3598-binding 2022-07-21 16:46:22 +02:00
Cayo Puigdefabregas 9f0edf5bd8 CHANGELOG.md 2022-07-21 16:46:01 +02:00
cayop 7ff9673bde
Merge pull request #318 from eReuse/bugfix/remove-tag
fix get id from js
2022-07-21 16:49:18 +02:00
Lint Action 0d2edef437 Fix code style issues with ESLint 2022-07-21 14:49:02 +00:00
Cayo Puigdefabregas a7e1daca79 fix get id from js 2022-07-21 16:30:35 +02:00
Cayo Puigdefabregas 60e46fae7b drop check in dummy 2022-07-21 14:01:20 +02:00
Cayo Puigdefabregas d0bfb9644d add phid and tags in labels 2022-07-21 13:56:09 +02:00
Cayo Puigdefabregas 71efe63ca9 fix migration 2022-07-20 17:29:29 +02:00
Cayo Puigdefabregas 5d9928bd70 fixed tests 2022-07-20 14:58:32 +02:00
Cayo Puigdefabregas 7db53a5779 fix delete device 2022-07-20 12:39:21 +02:00
Cayo Puigdefabregas 924d9941bc resolve conflict 2022-07-20 12:28:08 +02:00
cayop fa7bb86974
Merge pull request #317 from eReuse/bugfix/3613-export-placeholder
Bugfix/3613 export placeholder
2022-07-20 12:17:34 +02:00
Cayo Puigdefabregas b0dca83a3a CHANGELOG.md 2022-07-20 12:11:37 +02:00
Cayo Puigdefabregas 61db45959b CHANGELOG.md 2022-07-20 12:08:55 +02:00
Cayo Puigdefabregas c93f1360f8 fix export_devices 2022-07-20 11:52:36 +02:00
Cayo Puigdefabregas 5d573e2305 Deactivate 'Devices Lots Spreadsheet' in unassigned list 2022-07-20 11:31:54 +02:00
Cayo Puigdefabregas 02404c4277 fix export placeholders 2022-07-20 11:19:45 +02:00
Cayo Puigdefabregas 2aafe9efcc remove add tag automaticaly 2022-07-20 10:33:44 +02:00
Cayo Puigdefabregas a2b9d1c96d drop filter only by wb device 2022-07-20 10:03:46 +02:00
Cayo Puigdefabregas e2870f2b3e fix 2b90b41a556a_create_placeholders by null enviroment 2022-07-19 19:02:21 +02:00
Cayo Puigdefabregas 1167b3cb1e fix tests 2022-07-19 18:40:27 +02:00