Commit Graph

279 Commits

Author SHA1 Message Date
Santiago L 290c260511 Update breadcrum: All devices VS Unassigned 2022-05-12 14:43:41 +02:00
Cayo Puigdefabregas b927e1ac54 Merge branch 'testing' into feature/#3100-wb-settings 2022-05-12 11:57:55 +02:00
Cayo Puigdefabregas 0e974c0e92 add tags in device list 2022-05-12 11:33:28 +02:00
Cayo Puigdefabregas fee1d6787c add column created and put order descendent from created field 2022-05-12 11:03:48 +02:00
Cayo Puigdefabregas 515f31c562 fixed bug #3387 2022-05-12 10:15:46 +02:00
Santiago L 80d18e34a8
Merge pull request #256 from RubenPX/makingPublic-fields
fix code issues & add support to old browsers
2022-05-11 18:38:14 +02:00
Cayo Puigdefabregas a2bfbef8cf Merge branch 'testing' into feature/list-snapshots-view-#3113 2022-05-11 18:24:25 +02:00
Santiago L 87194cf090
Merge pull request #266 from eReuse/bugfix/#3380-to-text
Fix error when trade.document.url is None on device_list.html
2022-05-11 18:23:24 +02:00
Cayo Puigdefabregas bdc04c643c fixed url == None 2022-05-11 18:14:33 +02:00
Cayo Puigdefabregas 0f512d4bb3 fix link to device and show correctly date 2022-05-11 18:00:18 +02:00
Cayo Puigdefabregas 1baeddbd56 Merge branch 'feature/server-side-render-parser-3021' into feature/list-snapshots-view-#3113 2022-05-11 17:04:47 +02:00
Cayo Puigdefabregas 123757793f add link on sidebar and put empty data 2022-05-11 17:03:31 +02:00
Cayo Puigdefabregas 5e74255145 basic list snapshots 2022-05-11 16:59:36 +02:00
Cayo Puigdefabregas b8e980cabe fixed tests 2022-05-11 13:14:11 +02:00
Cayo Puigdefabregas 0e75865757 fix settings.html 2022-05-11 11:58:54 +02:00
Cayo Puigdefabregas 7ee2f2962b add view for download Workbench settings 2022-05-11 11:48:53 +02:00
RubenPX ec9074ae7c add register user dialog 2022-05-09 14:03:51 +02:00
RubenPX 651c0cb9d8 Fix text select lots instead devices 2022-05-09 13:57:17 +02:00
RubenPX 2e42b08519 use babel to support old browsers 2022-05-09 11:07:57 +02:00
Cayo Puigdefabregas 8d9abb58e3 fixed bug #3352 2022-05-09 10:18:22 +02:00
Santiago L 84b384c47b
Merge pull request #254 from RubenPX/patch-1
Fix minor typos
2022-05-06 20:17:36 +02:00
Santiago L 4c16065afa Fix typo: Unassgined to Unassigned #3339 2022-05-06 20:15:35 +02:00
RubenPX eb5c109220 Merge commit '7177b0fbfda37e495387834c7f2342b78f6559c8' into feature/confirm-trade-changes 2022-05-06 08:26:37 +02:00
Santiago L 00c5070784
Merge pull request #241 from RubenPX/bugfix/various-fixes
Several bug fixes on selector & lot component
2022-05-06 07:52:15 +02:00
Cayo Puigdefabregas 3ca7292448 drop download public links 2022-05-05 18:36:52 +02:00
Cayo Puigdefabregas 33fd574f18 add lots tab in device details 2022-05-05 12:31:29 +02:00
Cayo Puigdefabregas 1c670641f4 add web: public link in device details page 2022-05-05 12:00:40 +02:00
Cayo Puigdefabregas f2a85af1c2 fix login 2022-05-04 12:53:22 +02:00
Cayo Puigdefabregas 8a6b0cde37 change colors and log 2022-05-04 12:23:04 +02:00
RubenPX cb4f12eb1e Merge remote-tracking branch 'MyRepo/testing' into feature/confirm-trade-changes 2022-05-03 19:21:14 +02:00
RubenPX e30779fcde Merge remote-tracking branch 'MyRepo/testing' into bugfix/various-fixes 2022-05-03 19:20:59 +02:00
RubenPX 9d9514e68b Select full list devices 2022-05-03 12:13:15 +02:00
Cayo Puigdefabregas c82f173edf resolve conflict 2022-04-28 18:47:56 +02:00
Cayo Puigdefabregas c14d8482be Merge branch 'testing' into change/#3202-change-tag-for-unique-identifier 2022-04-28 18:32:39 +02:00
Cayo Puigdefabregas 3a5e806104 add icons types of devices in list of devices 2022-04-28 17:46:12 +02:00
RubenPX 4aa024b041 checkpoint: add confirmation dialog 2022-04-28 16:58:44 +02:00
Santiago L 293364acfb
Merge pull request #222 from eReuse/feature/extend-user-datas-#3016
Feature: allow user to update its password #3016
2022-04-28 12:08:00 +02:00
Santiago L 3fd208c479 Restore tabs to include title "Change password" 2022-04-28 11:50:07 +02:00
Cayo Puigdefabregas 87c66cf5cd change tags for unique identifiers 2022-04-28 11:47:52 +02:00
Santiago L 6946a2584b Refactor: group related code (delete button & modal status) 2022-04-28 11:39:40 +02:00
Santiago L 8125279619 Add comment to not rendered code 2022-04-28 11:38:31 +02:00
Cayo Puigdefabregas c2e4313521 change tag for Unique identifier in label_details 2022-04-28 11:16:12 +02:00
Cayo Puigdefabregas ad11521b64 fix label details for new architecture 2022-04-28 10:14:10 +02:00
Cayo Puigdefabregas e378fef1a6 add customize options in print html and pdf 2022-04-27 18:56:15 +02:00
Cayo Puigdefabregas b11bb163a0 hide 2 trade buttons 2022-04-26 17:35:29 +02:00
Cayo Puigdefabregas ef3ea288ce Merge branch 'testing' into feature/extend-user-datas-#3016 2022-04-26 16:37:12 +02:00
Cayo Puigdefabregas 13950a5ff6 show only password reset 2022-04-26 16:35:16 +02:00
Santiago L b0f9a83dce
Merge pull request #232 from RubenPX/fix-max-lots-list
[Change] Set max lots list to 20
2022-04-25 11:29:04 +02:00
RubenPX e48a6c1ae4 set max lots list to 20 2022-04-25 11:19:55 +02:00
Santiago L 73d0e77281 Rename CSS files 2022-04-22 11:12:29 +02:00
Santiago L dd4e938d30 Split custom CSS & niceadmin theme CSS
Keep original source Nice Admin template to keep easy future updates
2022-04-22 11:07:18 +02:00
RubenPX 740af8f7b6 Style fix show lots as list 2022-04-21 19:53:09 +02:00
Santiago L 33783b6e7d Revert "Fix login width"
This reverts commit d3564a6ba5.
2022-04-20 12:04:50 +02:00
RubenPX 22ddea4a43
Merge branch 'testing' into change/frontend-fixes 2022-04-19 10:42:51 +02:00
Cayo Puigdefabregas 379a2efca2 errors in snapshots 2022-04-13 20:15:40 +02:00
Cayo Puigdefabregas 04cdb8181f drop settings and last_name of agent 2022-04-13 18:41:05 +02:00
Cayo Puigdefabregas a0a52d8248 view list for snapshot errors 2022-04-13 18:31:39 +02:00
RubenPX c256936b7d fix trade lots modal 2022-04-13 13:27:38 +02:00
RubenPX 4611f79b44 lint 2022-04-12 14:12:21 +02:00
RubenPX 28bcf17083 Merge branch SearchPR and DeviceLotsList 2022-04-12 13:41:18 +02:00
RubenPX d985744fb8 fix device list padding 2022-04-12 13:19:56 +02:00
RubenPX d3564a6ba5 Fix login width 2022-04-12 13:17:17 +02:00
RubenPX 6c4d549c0a fix button spacing on tags management 2022-04-12 12:59:53 +02:00
RubenPX 08ebc862ae fix href link 2022-04-12 12:59:22 +02:00
RubenPX 23d8ba1570 fix lot buttons 2022-04-12 12:57:46 +02:00
RubenPX cb1f4377d6 Fix button spacing 2022-04-12 12:44:24 +02:00
RubenPX 89647f6ed5 Remove unused views 2022-04-12 12:41:05 +02:00
RubenPX c910e0f7c0 Avoid hide dropdown when user clicked inside 2022-04-12 11:38:31 +02:00
RubenPX 34da3599f3 Fix start search info 2022-04-12 09:40:45 +02:00
Cayo Puigdefabregas 9d4ca5a2dc change password 2022-04-11 19:48:59 +02:00
Cayo Puigdefabregas 1820b15255 save data profile 2022-04-11 17:16:20 +02:00
Santiago L 4065f46dd9 Merge branch 'testing' into PR-lots-list 2022-04-11 16:19:23 +02:00
RubenPX b08a013912 Remove demo data 2022-04-11 13:51:27 +02:00
RubenPX 756c7bd1c4 Search lots and devices 2022-04-11 11:44:48 +00:00
RubenPX e7dbb34315 Moved api lines to fork with others features branches
Future freature (Search feature)
2022-04-11 11:25:30 +02:00
RubenPX 06456b352f Refactor to reduche changes code 2022-04-11 10:42:56 +02:00
RubenPX 26275552c5 Select all functionality 2022-04-08 12:40:50 +02:00
RubenPX 9489a70597 Fixed currentuser.token
It needs ":" at finally of string
2022-04-07 14:24:09 +02:00
RubenPX 184d22ac81 Fix User token
Needs encode string to Base64
2022-04-07 14:12:20 +02:00
RubenPX 629a773dd2 Add reactive lots list 2022-04-07 13:28:07 +02:00
Cayo Puigdefabregas d1310a67bf add profile form 2022-04-06 13:50:08 +02:00
Cayo Puigdefabregas 3114c678a4 add user model fields #3017 2022-04-06 12:35:08 +02:00
Santiago L 277c3a84a9 Rename removelot.html -> lot_delete_modal.html 2022-04-05 11:49:47 +02:00
Santiago L 64182403a2 UI: update button colors 2022-04-05 11:47:12 +02:00
Santiago L 82cea04625 Sort lot action's buttons 2022-04-05 11:46:31 +02:00
Santiago L c9068385c3 Update icons of device buttons 2022-04-05 11:40:23 +02:00
Santiago L 8ea8fba201 Add link to help.usody.com 2022-04-05 11:32:55 +02:00
Santiago L 1e79948e57 Drop broken link of breadcrumb 2022-04-05 11:32:27 +02:00
Santiago L 683c7cff72 Hide user profile details untils is implemented 2022-04-05 11:28:07 +02:00
Santiago L b465513212 Fix flask.messages render 2022-04-05 11:27:21 +02:00
Cayo Puigdefabregas 7a532fb02c change label for labels 2022-03-31 16:12:35 +02:00
Cayo Puigdefabregas aa5d93cf48 modularize labels instead of tags into inventory 2022-03-31 14:04:16 +02:00
Cayo Puigdefabregas f8e1776ca8 Change names tags for labels in the labels sections 2022-03-17 09:41:03 +01:00
Cayo Puigdefabregas a36fb0b0fc generate pdf with multiple devices 2022-03-16 14:27:55 +01:00
Cayo Puigdefabregas a8df3f5e5a Render a template for get a labels of multiple devices 2022-03-16 13:06:42 +01:00
Santiago L 8085700009 Hide "remember be" until it is implemented 2022-03-15 14:41:26 +01:00
Santiago L 754f75eab4 Rename base URL 'inventory.devices' => 'inventory' 2022-03-15 14:33:27 +01:00
Cayo Puigdefabregas b4b12da477 Add of DeviceHub in template 2022-03-15 11:46:32 +01:00
Santiago L 57e9a7ef9a Include version of DeviceHub (hardcoded) on footer 2022-03-15 11:12:53 +01:00
Santiago L 678dfb0ea9 Refactor filter form HTML markup
Avoid using row & col
2022-03-15 10:59:55 +01:00