Commit Graph

1918 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 112f459db3 resolve conflict 2022-04-29 11:09:18 +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 d8a44c661a Merge branch 'testing' into feature/server-side-render-parser-3021 2022-04-28 18:45:51 +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
Cayo Puigdefabregas 11201cc0bd Merge branch 'testing' into feature/server-side-render-parser-3021 2022-04-26 13:30:52 +02:00
Cayo Puigdefabregas ef65b1084e Revert "HiddenField instead of StringField"
This reverts commit 04063db60e.
2022-04-26 12:56:34 +02:00
Cayo Puigdefabregas c3bb5cb863 Revert "add print_labels instead of call submit from the template"
This reverts commit 022d40edbe.
2022-04-26 12:56:02 +02:00
Cayo Puigdefabregas 2a7eeb0b5d Revert "add print_labels instead of call submit from the template"
This reverts commit c8aefc6029.
2022-04-26 12:55:48 +02:00
Cayo Puigdefabregas ad9a8a04bd Revert "drop commits 04063db 022d40e c8aefc6"
This reverts commit 9dbebed9d5.
2022-04-26 12:55:01 +02:00
Cayo Puigdefabregas b933581b89 add file snapshotErrorsComponents.json 2022-04-26 12:12:31 +02:00
Cayo Puigdefabregas 9dbebed9d5 drop commits 04063db 022d40e c8aefc6 2022-04-26 11:52:51 +02:00
Cayo Puigdefabregas f34fedfb74 fix migration file 2022-04-26 11:49:40 +02:00
Cayo Puigdefabregas 53a43ff6cb add test for wb lite 2022-04-26 10:47:29 +02:00
Cayo Puigdefabregas 1c12548851 return 422 if no there are components neither hid 2022-04-26 10:47:04 +02:00
Cayo Puigdefabregas b836e0a9ae save exceptions of components 2022-04-26 10:44:49 +02:00
Cayo Puigdefabregas 6ef2d8795d clean try exception 2022-04-26 10:43:58 +02:00
Cayo Puigdefabregas f666047565 adapt test for error 400 instead of 422 2022-04-25 18:40:53 +02:00
Cayo Puigdefabregas aafebbb370 adapt correctly response 400 instead of default 422 2022-04-25 18:38:13 +02:00
Cayo Puigdefabregas 767f7c3092 add tests wb lite errors 422 2022-04-25 17:21:25 +02:00
Cayo Puigdefabregas e818feeebd required datas in json of wb lite, error 422 2022-04-25 17:20:54 +02:00
Cayo Puigdefabregas 515dad5850 fix test for the new api response 201 2022-04-25 14:06:05 +02:00
Cayo Puigdefabregas f37e55e3b5 add response 201 2022-04-25 14:05:30 +02:00
Cayo Puigdefabregas 531e213eff change sid for wbid in tests 2022-04-25 11:54:16 +02:00
Cayo Puigdefabregas a362c8644b add sid instead of wbid in schema action snapshot 2022-04-25 11:53:27 +02:00
Cayo Puigdefabregas 7b784b6174 sid in snapshot action 2022-04-25 11:45:50 +02:00
Cayo Puigdefabregas be53827c02 sid in parser and inventory 2022-04-25 11:45:25 +02:00
Cayo Puigdefabregas 9b1e8617fa add sid in snapshot_errors 2022-04-25 11:43:30 +02:00
Cayo Puigdefabregas 4ab692405f add migrations change sid for wbid 2022-04-25 11:30:41 +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