Commit Graph

1818 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 9a74eabc23 add color in bordered navs links 2022-05-04 18:06:19 +02:00
Cayo Puigdefabregas 074fd4e542 fix sidebar 2022-05-04 17:39:20 +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
cayop 8591f061a8
Merge pull request #246 from eReuse/bugfix/change-lot-name
fix bug
2022-05-03 17:22:59 +02:00
Cayo Puigdefabregas eaf8bdef65 fix bug 2022-05-03 17:00:02 +02:00
cayop 60a11794ae
Merge pull request #243 from eReuse/bugfix/#3288-common-lots
Bugfix/#3288 common lots
2022-04-29 19:25:55 +02:00
cayop 861515c46d
Merge pull request #229 from eReuse/feature/server-side-render-testing
Feature/server side render testing
2022-04-29 18:39:37 +02:00
Cayo Puigdefabregas 98ffe1092c Merge branch 'testing' into bugfix/#3288-common-lots 2022-04-29 18:36:52 +02:00
Cayo Puigdefabregas 921049a28b add more render basic tests 2022-04-29 18:23:05 +02:00
Cayo Puigdefabregas 7fe33f3a42 ass form errors in message 2022-04-29 17:53:59 +02:00
Cayo Puigdefabregas 322b340607 add fix test with redirects 2022-04-29 17:41:13 +02:00
Cayo Puigdefabregas ef71eed27f Merge branch 'testing' into feature/server-side-render-testing 2022-04-29 13:12:09 +02:00
Cayo Puigdefabregas ad0ced98e4 refactor common context 2022-04-29 13:10:44 +02:00
Cayo Puigdefabregas 9f8f5ec9e0 fix unique identifier 2022-04-29 11:38:47 +02:00
Santiago L c176659cbe
Merge pull request #238 from eReuse/feature/#3262-customize-labels
Feature/#3262 customize labels
2022-04-29 09:09:49 +02:00
Cayo Puigdefabregas c82f173edf resolve conflict 2022-04-28 18:47:56 +02:00
cayop 09c5126b0c
Merge pull request #239 from eReuse/change/#3202-change-tag-for-unique-identifier
change tags for unique identifiers
2022-04-28 18:47:55 +02:00
Cayo Puigdefabregas c14d8482be Merge branch 'testing' into change/#3202-change-tag-for-unique-identifier 2022-04-28 18:32:39 +02:00
cayop a5bc694d86
Merge pull request #242 from eReuse/feature/add-column-type-in-devices-list
add icons types of devices in list of devices
2022-04-28 18:19:09 +02:00
Cayo Puigdefabregas 7362eb4492 add computer monitor 2022-04-28 17:56:00 +02:00
Cayo Puigdefabregas 3a5e806104 add icons types of devices in list of devices 2022-04-28 17:46:12 +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 d0e033197c Drop Agent.get_full_name because is unused 2022-04-28 12:06:43 +02:00
Santiago L 9afe6bf9e6 Revert all changes related to ProfileForm
We need to talk about the concepts of Agent and User and their
relationship before allowing the user to update their data.
2022-04-28 12:03:12 +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 46c9e3f0cf
Merge pull request #235 from eReuse/changes/Hidde-trade-#3250
hide 2 trade buttons
2022-04-28 11:41:27 +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 bf42a79ef7 change devices for tags in printlabels 2022-04-27 18:55:27 +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 f299367ba7
Merge pull request #231 from RubenPX/testing
fix github actions ESLint
2022-04-25 11:29:47 +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
Santiago L 91277b048d
Merge pull request #230 from RubenPX/bugfix/fix-lots
[Bugfix] fix lots component issues
2022-04-25 11:27:47 +02:00
RubenPX e48a6c1ae4 set max lots list to 20 2022-04-25 11:19:55 +02:00
RubenPX f8b852708d Fix github actions 2022-04-25 11:15:33 +02:00
RubenPX 1c0cef120e Fix height list, use px instead of vh 2022-04-22 13:04:09 +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 49c7caf5bd Fix set max height 2022-04-21 20:14:36 +02:00
Lint Action 7c96c5706c Fix code style issues with ESLint 2022-04-21 18:04:42 +00:00
RubenPX a9299077aa fix typo 2022-04-21 19:59:10 +02:00
RubenPX 454fb891e2 Order lots 2022-04-21 19:53:27 +02:00
RubenPX 740af8f7b6 Style fix show lots as list 2022-04-21 19:53:09 +02:00