DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
8501 commits 95 branches 267 tags 294 MiB
Commit graph

2713 commits

Author SHA1 Message Date
snipe 723454b04d Changed model file icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 16:17:35 -07:00
snipe 9c86b4bf88 Fixes padlock icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 15:57:33 -07:00
snipe bae9792f01 Missed two 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:36:09 -07:00
snipe b98af0f50f Upgrade font-awesome to v6 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:22:08 -07:00
snipe bfc8c18675
Merge pull request #11451 from mikeroq/fixes/populate_custom_fields_from_asset_model_create 
Fixes custom fields not populating when creating asset from asset model page
 2022-07-05 17:31:08 -07:00
snipe ef17fd41f7
Merge branch 'develop' into develop 2022-07-05 16:26:53 -07:00
snipe dae53a1128 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 16:18:53 -07:00
mikeroq 2781bd02b5 Add TODO to indicate future refactoring. 2022-07-05 18:02:37 -05:00
Daniel Reeder 7772ef22db Quick typo fix 2022-07-04 21:57:54 +00:00
snipe afab167e8c Fixed restore button in listings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-02 13:08:46 -07:00
snipe af14ee0d47
Merge pull request #11453 from mikeroq/fixes/asset_restore_not_working 
Fixes #11452 - Asset Restore routes/buttons also asset models/users restore as well
 2022-07-02 13:07:29 -07:00
Mike Roquemore 07ac4087a3 Remove link from alert since there is already a restore button on the side 2022-07-02 14:34:22 -05:00
Mike Roquemore 123963c14c Modify genericActionsFormatter restore link to be a button instead since it's in a form. 
Changed user restore route to POST
 2022-07-02 14:34:22 -05:00
Mike Roquemore 1b45170ca3 Adds check if request has model_id, if so call fetchCustomFields on document ready 2022-07-01 20:15:11 -05:00
snipe b910db0617 Fixed #11393 - reject acceptance if no file is present 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 21:01:58 -07:00
snipe df1e2687d6 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 17:35:02 -07:00
snipe 46d055cf74 Fixed weird extra padding on crown 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 14:17:53 -07:00
Godfrey M fc636ea888 removed redundant header 2022-06-29 12:01:56 -07:00
Godfrey M e471aa8639 adds button to email user list of assets from profile 2022-06-29 11:15:15 -07:00
snipe 5b02d9ed06 Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/account/accept/create.blade.php
 2022-06-29 04:58:13 -07:00
snipe be9e6fe847 Another typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-29 00:24:33 -07:00
snipe b0e13611f7 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-29 00:24:08 -07:00
snipe f3075facb4 Added delete button 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 16:25:22 -07:00
snipe ed95adb45c Show model files on hardware page 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 16:17:46 -07:00
snipe 95d4f7c62e Added models router to BS tables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 15:56:18 -07:00
snipe c90ed9f25f Allow models uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 15:50:07 -07:00
snipe 7f664a7971 Layout changes for file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 12:32:12 -07:00
snipe 4a3f56acf2 Removed old cooke stuff 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 16:35:54 -07:00
snipe e33a4c2ef2 Added disclosure arrows to use screen 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 16:35:44 -07:00
Brady Wetherington 34b4499178 Remember the state of the disclosure triangles in Assets 2022-06-27 12:57:19 -07:00
snipe 8f900fb4e1 More UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 12:15:11 -07:00
snipe 9355689dd4 Nicer output for custom fields error 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 11:52:51 -07:00
snipe 0909feaa6b Few more UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 11:01:19 -07:00
snipe 7f18180105 Fixed toggle 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 10:26:37 -07:00
snipe 08525a3c20 Few more changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 09:43:32 -07:00
snipe d70b36750c
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset 
Fixes #8155 -  improve the workflow during asset creation
 2022-06-24 18:53:07 -07:00
snipe 8c85d7bc97
Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating 
Adds validation to custom fields' default values
 2022-06-24 18:11:16 -07:00
snipe be0f0fc421
Merge pull request #11388 from snipe/features/disable_purge_in_env 
Disallow purge backup deletion by default and, enable via .env
 2022-06-24 16:12:00 -07:00
Brady Wetherington 3b3f1a817e Typo of 'general' was in the migration blade a few places 2022-06-24 16:00:15 -07:00
snipe 75d19d815d Still show the purge button even if not allowed to avoid confusion 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:59:40 -07:00
snipe fce4f0dc0e Disable delete button if not allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:49:07 -07:00
snipe 657039882c Added purge and backup strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:48:46 -07:00
snipe 77bf28bcb6 Disallow purge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 20:11:43 -07:00
snipe ce2362459c Layout tweak for search and back placement 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:30:52 -07:00
snipe 4e568bec8a Moves the settings search box higher 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:25:30 -07:00
snipe 86d2c2b153 Small naming changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:11:59 -07:00
snipe f0cc418965
Merge pull request #11383 from snipe/features/adds_user_id_to_users 
Added created_by to users
 2022-06-23 18:48:42 -07:00
snipe 62ab867051 Fixed url param 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:43:10 -07:00
snipe 3e559044b2 Changed method and scope names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:41:13 -07:00
snipe 75a631b91f
Merge pull request #11375 from Godmartinz/bootS_dropdown_menu_fix 
fixes dropdown column select font color  in bootstrap tables
 2022-06-23 18:31:36 -07:00
snipe 1c25057e42
Merge pull request #11379 from Godmartinz/license_acceptance_eula 
adds eula blade for licenses/consumables/components and fixes assigned_to for dom_pdf
 2022-06-23 18:26:19 -07:00
snipe 590630e4e0
Merge pull request #11386 from snipe/fixes/default_skin_settings_colors 
Small fixes to default blue
 2022-06-23 18:23:45 -07:00
snipe 35365882ac Used new settings_button class in settings index 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:10:28 -07:00
snipe ea254ccc04 Tweaked default @blue 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:10:14 -07:00
snipe 06d5b5f4b1 Small change to color in overrides 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:10:03 -07:00
snipe 2536b02ace Fixed some colors on default skin 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:09:52 -07:00
snipe 6b8abb1511 Fixed missing archived tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:32:39 -07:00
snipe e63183649a Show admin in user view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:17:48 -07:00
snipe 1a4579b770 Missed one 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 16:00:27 -07:00
snipe 398c77bfdc Use new scope for additional tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 15:37:39 -07:00
snipe d45d322b54 Use scoped query for asset count 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 13:43:23 -07:00
Godfrey M b0897a1fc9 adds acceptance for consumables and components 2022-06-23 11:52:35 -07:00
snipe e2b1494511 Reordered and added xlsx to export list 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 11:18:59 -07:00
Godfrey M df76e6eacf adds eula blade for licenses and fixes assigned_to for dom_pdf 2022-06-23 11:15:15 -07:00
Godfrey M 541ae919d9 fixes dropdown column select font color in bootstrap tables 2022-06-23 09:38:44 -07:00
Ivan Nieto Vivanco 7976401aa2 Add error message when the default customfield values can't be validated 2022-06-22 22:17:05 -05:00
Ivan Nieto Vivanco 7e10abe605 Fix the date control in custom fields' default values form to show the selected date 2022-06-22 21:47:08 -05:00
Ivan Nieto Vivanco afdf93ca63 Adds controls for custom fields of type date in the default value form 2022-06-22 21:37:11 -05:00
snipe cae66753fb
Merge pull request #11323 from Godmartinz/bug/sc-19255/issues-with-black-light-sk 
fixes non-dark mode black theme
 2022-06-22 15:47:55 -07:00
snipe f0f37df76e Added missing postal code from user view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 12:18:57 -07:00
snipe 89c234b1c2
Merge pull request #11358 from snipe/fixes/missing_token_lang 
Fixed missing password.token string and checked for user existing before attempting to send reset email
 2022-06-22 11:15:08 -07:00
snipe a7a61a3620 Fixed #11351 - add link on asset view to order number 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 11:07:54 -07:00
snipe d67afc3bd0
Merge pull request #11359 from uberbrady/dont_show_images_on_checkin_email_if_not_requested 
Fixes issue where asset images were showing up in checkin emails
 2022-06-21 19:34:22 -07:00
Brady Wetherington 1156eea8af Fixes issue where asset images were showing up in checkin emails 2022-06-21 19:11:16 -07:00
snipe 2f258a3e3d Make the strings match 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 18:48:22 -07:00
snipe 1b6df232aa Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 18:41:02 -07:00
snipe de048e1009 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 16:13:59 -07:00
snipe 68150d11b7 Make logo clickable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 16:13:52 -07:00
snipe d4c53945d9 Tweaked language 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 14:19:49 -07:00
snipe 21875100b6 Fixed missing password.token string and checked for user existing before trying to reset 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 14:15:38 -07:00
snipe a111482217 Use number_format on badges 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 14:59:06 -07:00
snipe b3605fa141 Merge remote-tracking branch 'origin/develop' 2022-06-15 11:39:16 -07:00
snipe 677e5a8cf1 Added tab badges to company detail view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 11:37:44 -07:00
snipe 872600a7a7 Link company on license page 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 11:37:26 -07:00
Godfrey M 3a879bda4a more adjustments 2022-06-15 11:08:42 -07:00
Godfrey M a6852cf4d2 fixes non-dark mode black theme 2022-06-15 10:20:25 -07:00
snipe 5fe1078013 Squashed commit of the following: 
commit a011b07d99
Merge: b392ed269 6059e9e11
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:50 2022 -0700

    Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables

    Added fullscreen option to tables

commit b392ed269b
Merge: 693043e64 e6d792bdf
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:41 2022 -0700

    Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header

    Tweaked CSS for smaller padlock

commit 6059e9e119
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:49:00 2022 -0700

    Added fullscreen option to tables

    Signed-off-by: snipe <snipe@snipe.net>

commit e6d792bdf7
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:43:12 2022 -0700

    Tweaked CSS for smaller padlock

    Signed-off-by: snipe <snipe@snipe.net>

Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:54:18 -07:00
snipe a011b07d99
Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables 
Added fullscreen option to tables
 2022-06-14 17:52:50 -07:00
snipe 6059e9e119 Added fullscreen option to tables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:49:00 -07:00
snipe e6d792bdf7 Tweaked CSS for smaller padlock 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:43:12 -07:00
snipe f16a4b6aef Removed footer from show category 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:16:14 -07:00
snipe 693043e645
Merge pull request #11313 from snipe/fixes/nicer_suppliers_mfgs_ui 
Nicer suppliers and manufacturers UI
 2022-06-14 17:14:53 -07:00
snipe cc6a2f2d49 Use the Deja Vu font to be able to support cyrllic, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 16:23:30 -07:00
snipe bfec0059c5 Improved manufacturers UI 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 16:10:36 -07:00
snipe aea9dd1de5 Improved suplpiers UI 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 16:06:56 -07:00
snipe f1a63f25e7 Partialize and add data atributes to statuslabel bulk 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 12:50:26 -07:00
snipe 88dfdb7538 Fixed bug in uncheck 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 12:50:10 -07:00
snipe 9072f7c6c9 Added click-to-select to tables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 12:49:50 -07:00
snipe e8973f08b5 Added a back button 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:47:35 -07:00
snipe dd9c9520fb Correctly filter by category_id 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:42:21 -07:00