Commit Graph

2582 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 8c1ea5786e add v14 iso for download erease settings 2022-08-05 11:07:54 +02:00
Cayo Puigdefabregas 43da3f0a4f resolve conflict 2022-08-04 18:25:02 +02:00
Cayo Puigdefabregas 6f87005f18 Merge branch 'master' into testing 2022-08-04 15:30:25 +02:00
cayop 95c3803752
Merge pull request #326 from eReuse/feature/hello-wb-settings
new hello settings
2022-08-04 15:24:41 +02:00
Cayo Puigdefabregas 497d522ce8 new hello settings 2022-08-04 14:38:43 +02:00
Cayo Puigdefabregas a3a8f377f0 new settins page 2022-08-04 14:09:59 +02:00
cayop 5593425c60
Merge pull request #325 from eReuse/feature/3598-binding
fix migration only devices without placeholders
2022-08-03 18:42:55 +02:00
Cayo Puigdefabregas d03850b278 fix migration only devices without placeholders 2022-08-03 18:41:58 +02:00
cayop d8afbb72cc
Merge pull request #324 from eReuse/feature/3598-binding
Feature/3598 binding
2022-08-03 17:30:57 +02:00
Cayo Puigdefabregas 1b5debc77f fix battery migration 2022-08-03 17:29:13 +02:00
Cayo Puigdefabregas dcc445a42e fix battery migration 2022-08-03 17:28:59 +02:00
cayop ae847b8ee2
Merge pull request #316 from eReuse/feature/3598-binding
Feature/3598 binding
2022-08-03 16:25:00 +02:00
Cayo Puigdefabregas 08d7012bd9 CHANGELOG.md 2022-08-03 16:03:09 +02:00
Cayo Puigdefabregas beb687b967 add binding and unbinding tests 2022-08-03 16:00:25 +02:00
Cayo Puigdefabregas 23ef1e2bae fix test basic 2022-08-02 18:01:28 +02:00
Cayo Puigdefabregas 829266a808 fix excess of line 2022-08-02 17:44:36 +02:00
Cayo Puigdefabregas 83519219c7 switch order of migration 2022-08-02 16:31:27 +02:00
Cayo Puigdefabregas 080fc039ec drop cascade own 2022-08-02 13:14:02 +02:00
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