Commit Graph

391 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 36dfba584d status colors and messages 2022-08-29 12:56:10 +02:00
Cayo Puigdefabregas d3f87d553b fix actions and tags colums 2022-08-29 12:55:53 +02:00
Cayo Puigdefabregas df37c46636 messages and colors in binding details 2022-08-29 12:50:01 +02:00
Cayo Puigdefabregas 2f74a7526a declare real and abstract details in the head 2022-08-29 11:38:16 +02:00
Cayo Puigdefabregas 3900d5b878 Merge branch 'testing' into feature/3702-update-binding 2022-08-29 09:29:02 +02:00
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 ee754f6c64 Merge branch 'testing' into feature/3702-update-binding 2022-08-12 16:12:00 +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
Cayo Puigdefabregas ae4ea03b49 add new view for search phid 2022-08-12 15:59:15 +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
Cayo Puigdefabregas 1e5254d7d3 buttons binding/unbinding 2022-08-12 12:28:48 +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 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 62b235a455 to do binding from real device 2022-08-11 17:30:00 +02:00
Cayo Puigdefabregas 138dc66b9a modify details page and binding/unbinding page 2022-08-11 14:50:47 +02:00
Cayo Puigdefabregas 6bcaa94a3d template for erase wb 14 2022-08-11 10:01:20 +02:00
Cayo Puigdefabregas 7ed2368f02 unic template for device details 2022-08-11 09:51:17 +02:00
Cayo Puigdefabregas f55abc4a7b put the old dhid in the new placeholder device 2022-08-10 18:05:18 +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 1996e8fa7a new concept of status abstract of a device 2022-08-05 16:42:07 +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 7e4deea7fe add unbinding 2022-07-29 17:02:27 +02:00
Cayo Puigdefabregas 497e29a2da add manual binding 2022-07-28 17:48:14 +02:00
Cayo Puigdefabregas d0bfb9644d add phid and tags in labels 2022-07-21 13:56:09 +02:00
Cayo Puigdefabregas 924d9941bc resolve conflict 2022-07-20 12:28:08 +02:00
Cayo Puigdefabregas 5d573e2305 Deactivate 'Devices Lots Spreadsheet' in unassigned list 2022-07-20 11:31:54 +02:00
Cayo Puigdefabregas 376021470c allow device_details without placeholder 2022-07-18 12:56:33 +02:00
Cayo Puigdefabregas 2b5ff4cb2f add placeholder details in detail of device 2022-07-15 16:47:39 +02:00
Cayo Puigdefabregas d4824a4333 add placeholder log in form 2022-07-07 13:10:05 +02:00
Cayo Puigdefabregas e8b957c697 call one time all lots reset 2022-07-05 18:18:29 +02:00
Cayo Puigdefabregas 3a06ade79f call one time all lots 2022-07-05 18:10:17 +02:00
Cayo Puigdefabregas bc8944a498 add manual edit placeholder 2022-07-05 18:09:47 +02:00
Cayo Puigdefabregas 71518ca2a5 add upload form placeholder 2022-07-04 11:26:24 +02:00
Cayo Puigdefabregas 3dae7e3a58 ux menu 2022-06-29 17:31:54 +02:00
Cayo Puigdefabregas 3e2ed58b07 add number of devices to be created 2022-06-29 13:40:00 +02:00
Cayo Puigdefabregas 01e1d6e0b7 add computers as placeholders 2022-06-29 11:51:03 +02:00
Cayo Puigdefabregas d2924dfafe add fields in template 2022-06-28 17:38:31 +02:00
Cayo Puigdefabregas 9829ebe7c7 add download snapshots 2022-06-24 15:05:38 +02:00
cayop 035ccc7315
Merge pull request #305 from eReuse/feature/3439-wb-iso
Feature/3439 wb iso
2022-06-24 12:03:49 +02:00
Cayo Puigdefabregas 7cb5c76562 add download iso 2022-06-23 18:08:56 +02:00
Cayo Puigdefabregas 6e3c032d97 3500 change name of anchor 2022-06-23 18:08:16 +02:00
Cayo Puigdefabregas 8bcbf21abe resolve conflicts 2022-06-23 17:08:07 +02:00
Cayo Puigdefabregas e55c1d4cab change link of export devices lots 2022-06-23 15:52:23 +02:00
Cayo Puigdefabregas 3ecf4c4a89 add dropdown menu in reports lots 2022-06-20 14:36:34 +02:00
Cayo Puigdefabregas e332cd2d43 add link to devices lot export 2022-06-20 10:36:24 +02:00
Cayo Puigdefabregas 740178f57b add link for report lots 2022-06-20 09:24:48 +02:00
Cayo Puigdefabregas cdf180cf38 drop metrics of devices list 2022-06-17 12:16:01 +02:00
Cayo Puigdefabregas 41196ae445 add system uuid to snapshots list 2022-06-15 13:39:06 +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
Cayo Puigdefabregas a65e93b470 add sid in template 2022-06-08 11:59:47 +02:00
Cayo Puigdefabregas 5932213764 save sid in html label 2022-06-08 09:26:09 +02:00
Cayo Puigdefabregas eb66baf842 fix snapshot_uuid == None 2022-06-07 15:12:13 +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 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
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 88a0bdd44d resolv conflicts 2022-06-03 11:34:49 +02:00
Cayo Puigdefabregas ad7848edc6 add snapshotLog in old api 2022-06-03 11:06:49 +02:00
Cayo Puigdefabregas cce7dbfdf1 add view for advanced search 2022-06-02 13:46:10 +02:00
Cayo Puigdefabregas f58993c9d1 resolve conflicts 2022-06-01 15:01:02 +02:00
Cayo Puigdefabregas 29313e3470 add colors to open and closed 2022-06-01 13:26:17 +02:00
Cayo Puigdefabregas 96680937e9 add arrow right 2022-06-01 13:14:27 +02:00
Cayo Puigdefabregas e1e38015ee fix 2022-06-01 12:34:48 +02:00
Cayo Puigdefabregas ef36c11f6b change names of vars 2022-06-01 11:54:02 +02:00
Cayo Puigdefabregas f8f1276313 add description in transfer 2022-06-01 11:09:28 +02:00
Cayo Puigdefabregas dbd5645c94 show transfers if there are transfer 2022-05-31 16:28:38 +02:00
Cayo Puigdefabregas 9ca5ce48d1 add edit transfer 2022-05-30 16:32:25 +02:00
Cayo Puigdefabregas a8368e92b8 add html and form for transfers 2022-05-27 16:32:22 +02:00
Cayo Puigdefabregas ebe800158a modify updated and add registered 2022-05-25 17:37:24 +02:00
Cayo Puigdefabregas 83067fd2bb modify updated and add registered 2022-05-25 17:33:54 +02:00
Santiago L 7d7507c1d9
Merge pull request #273 from RubenPX/feature/lots-search
Feature: lots-search US 3334
2022-05-23 13:39:42 +02:00
RubenPX c0a7415f33
Update ereuse_devicehub/templates/inventory/device_list.html
Co-authored-by: Santiago L <santiago@ribaguifi.com>
2022-05-21 10:58:40 +02:00
Cayo Puigdefabregas 6ecbd4e09d add details of one entry snapshot log 2022-05-19 18:16:47 +02:00
Cayo Puigdefabregas 744b14f286 join all snapshots logs in one for every uuid 2022-05-19 13:48:52 +02:00
Cayo Puigdefabregas 0bc75ec547 add get_status 2022-05-18 18:26:01 +02:00
Cayo Puigdefabregas 04969ad939 clean template 2022-05-18 18:02:38 +02:00
Cayo Puigdefabregas c0abfd6f0b change version 2022-05-18 12:46:57 +02:00
RubenPX 79ce3dfc59 Load dev build on device_list 2022-05-18 11:16:22 +02:00
Cayo Puigdefabregas 99309162e3 change templates 2022-05-18 11:01:23 +02:00
Cayo Puigdefabregas bf547b6f80 Merge branch 'feature/server-side-render-parser-3021' into feature/list-snapshots-view-#3113 2022-05-17 09:23:31 +02:00
Cayo Puigdefabregas d935c987b3 comiter monitor instead of monitor 2022-05-16 12:40:14 +02:00
Cayo Puigdefabregas 727c06c3de add public link to device list 2022-05-16 11:54:02 +02:00
Cayo Puigdefabregas c1665ef4af Merge branch 'testing' into feature/#3396-add-columns-status 2022-05-16 10:16:23 +02:00
cayop 282b9490fb
Merge pull request #265 from eReuse/feature/#3100-wb-settings
Feature/#3100 wb settings
2022-05-16 10:18:45 +02:00
RubenPX adde4f88e4 add lots search interface 2022-05-13 21:27:50 +02:00
Cayo Puigdefabregas 11913d68c3 fix state instead of states 2022-05-13 17:16:08 +02:00
Cayo Puigdefabregas 1dcebc0112 #3401 change the values of the status in the page of device details 2022-05-13 13:11:00 +02:00