Commit Graph

1713 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 4564caa0ea Merge branch 'master' into testing 2022-08-29 09:28:29 +02:00
Cayo Puigdefabregas 2224fb890f fix qr link 2022-08-22 12:29:08 +02:00
Cayo Puigdefabregas b387572555 change USOdy by Usody in base templates 2022-08-12 16:09:47 +02:00
Cayo Puigdefabregas 7b0ceb0b5a change text help of wb settings template 2022-08-12 16:08:59 +02:00
cayop d6d9fa0d3f
Merge pull request #331 from eReuse/feature/3683-wb-page
update template settings wb
2022-08-12 13:59:20 +02:00
Cayo Puigdefabregas 995baa75bb update template settings wb 2022-08-12 13:37:15 +02:00
cayop eec5c7143c
Merge pull request #330 from eReuse/feature/3683-wb-page
Feature/3683 wb page
2022-08-12 10:55:30 +02:00
Cayo Puigdefabregas dcd229f12b fix not exist iso dir 2022-08-12 10:23:06 +02:00
Cayo Puigdefabregas cf6965f2e6 modify template wb 2022-08-11 18:10:46 +02:00
Cayo Puigdefabregas 803c02ef35 add help to the template 2022-08-11 18:04:30 +02:00
Cayo Puigdefabregas 6bcaa94a3d template for erase wb 14 2022-08-11 10:01:20 +02:00
Cayo Puigdefabregas f3766e49a8 drop pdbs 2022-08-10 10:49:29 +02:00
Cayo Puigdefabregas 6687898784 add placeholder datas 2022-08-09 17:52:18 +02:00
Cayo Puigdefabregas c55dbc3c8c create a Base device row 2022-08-09 17:13:29 +02:00
Cayo Puigdefabregas f63192c833 create a Base device row 2022-08-09 17:09:58 +02:00
Cayo Puigdefabregas 1098d3eb51 drop import ActionDevice 2022-08-09 13:25:42 +02:00
Cayo Puigdefabregas 43667dd9f2 fix twin 2022-08-09 13:22:56 +02:00
Cayo Puigdefabregas 10879e6143 fix unbinding 2022-08-09 13:19:16 +02:00
Cayo Puigdefabregas 967319f50c fix binding confirm 2022-08-09 12:17:18 +02:00
Cayo Puigdefabregas 74f17def71 add components to placeholder migration 2022-08-09 11:38:30 +02:00
Cayo Puigdefabregas 8c4f7eb10e add components placeholder and simplify binding process 2022-08-09 10:49:56 +02:00
Cayo Puigdefabregas 9782ab68d6 join actions and tags 2022-08-08 18:09:25 +02:00
Cayo Puigdefabregas 9800b48aa3 show dhi of placeholder in shapshot_log list 2022-08-05 16:52:56 +02:00
Cayo Puigdefabregas 1996e8fa7a new concept of status abstract of a device 2022-08-05 16:42:07 +02:00
Cayo Puigdefabregas ded8a23075 allow edit only phid on abstrac devices 2022-08-05 16:17:19 +02:00
Cayo Puigdefabregas 5d81db5b8c fix phid form upload 2022-08-05 15:50:03 +02:00
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
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
Cayo Puigdefabregas d03850b278 fix migration only devices without placeholders 2022-08-03 18:41:58 +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
Cayo Puigdefabregas beb687b967 add binding and unbinding tests 2022-08-03 16:00:25 +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 5ba879d4b5 other type of quotes 2022-08-01 19:17:21 +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
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