DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
8898 commits 97 branches 266 tags 292 MiB
Commit graph

2811 commits

Author SHA1 Message Date
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
snipe aec033d8d2 Use better phrasing for tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:33:37 -07:00
snipe 5496b62b33 Split categories into two tabs if the type = asset 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:30:50 -07:00
snipe e393e2eb4b Fixed issue in BS tables where uncheck-all then checking a few would not uncheck properly 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:30:35 -07:00
snipe 10781a6e4b Use new bulk edit partial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:29:17 -07:00
snipe 5a86004081 Created new models bulk edit partial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:29:08 -07:00
snipe d4a7811078
Merge pull request #11282 from Godmartinz/new_Yellow_skin 
redone none dark mode yellow skin
 2022-06-13 19:48:24 -07:00
snipe cb8dbcc172
Merge pull request #11281 from Godmartinz/chore_dark_mode_color_clean_up 
cleans up dark modes
 2022-06-13 19:48:15 -07:00
snipe 495e68d23c
Merge pull request #11258 from Godmartinz/bug/sc-19123/link-colors-slightly-different-settings 
Fixed colors in light color skins
 2022-06-13 19:48:05 -07:00
snipe 20a0c4e3b5
Merge pull request #11272 from inietov/fixes/date_localization_in_customfields 
Fixes #8143 Date localization not working on custom fields
 2022-06-13 19:47:20 -07:00
snipe bcb9804be8 Added a little more context to mail template 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 19:44:18 -07:00
snipe 5e59fa2598 Default to $snipeSettings->site_name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 19:29:46 -07:00
snipe 6ea722d41e
Merge pull request #11271 from inietov/fixes/bulk_delete_not_checking_assignedto_type 
Fix typo in language files
 2022-06-13 19:24:08 -07:00
snipe 93e4d23143 Changed font-awesome leading class 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 18:36:13 -07:00
Godfrey M b3559ac74e redone none dark mode yellow skin 2022-06-08 13:59:46 -07:00
Godfrey M 4252bd2348 cleans up dark modes 2022-06-08 13:17:16 -07:00
Godfrey M c8bc0eff11 fixes translation references in the users ldap blade 2022-06-08 09:52:55 -07:00
snipe 063893c109 Added new JS data attributes for assets in manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-08 04:18:05 -07:00
Ivan Nieto Vivanco 44f4f20187 Only fix typo in 'en' file 2022-06-07 19:09:59 -05:00
Ivan Nieto Vivanco 792b18f845 Return language files to previous state 2022-06-07 19:09:03 -05:00
Ivan Nieto Vivanco d2fc27e21d Add formatted date to EOL field in asset detailed view 2022-06-07 18:22:09 -05:00
Ivan Nieto Vivanco 740f27198f Evaluate if a custom field is a Date to present it with the correct format 2022-06-07 18:00:46 -05:00
Ivan Nieto Vivanco 064f4b3fc6 Fix typo in language files 2022-06-07 16:30:18 -05:00
Godfrey M 8c1843b351 updates colors in light color modes 2022-06-06 11:40:57 -07:00
snipe c9e86ac194 Merge remote-tracking branch 'origin/develop' 2022-06-06 10:23:37 -07:00
snipe f7449921e9
Merge pull request #11253 from snipe/features/nicer_locations_ui 
Nicer locations UI
 2022-06-06 10:23:04 -07:00
snipe 5f79534f4a Merge remote-tracking branch 'origin/develop' 2022-06-05 22:44:53 -07:00
snipe 01348187c8 Fixed #11224 - only show menu options if the user is allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 22:41:53 -07:00
snipe b26a4ad333 Added missing headers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:35:57 -07:00
snipe 89f45d3d05 Removed extra console logs and unused variable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:16:29 -07:00
snipe e83a062eda Use translation string for model editing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:11:50 -07:00
snipe 1ea667e709 Update views with additional data fields 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:56 -07:00
snipe 5326ebd136 Removed toolbar div we weren’t using 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:45 -07:00
snipe 4db9892f8c Use partial in overdue audit screen 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:12 -07:00
snipe 880828379e Update bulki partials with new values 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:02:51 -07:00
snipe 9b54077409 Additional tweaks to BS tables partial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:02:19 -07:00
snipe 9f478b51e2 Additional JS tweaking 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 20:13:51 -07:00
snipe 7c77e03c5a Initial rework of locations display 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 18:08:15 -07:00
snipe 5bc5e9f108 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/lang/en/admin/locations/general.php
 2022-06-05 17:14:31 -07:00
snipe 985e683896 Small display improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 16:59:53 -07:00
snipe 514db05770 Merge remote-tracking branch 'origin/develop' 2022-06-03 13:29:04 -07:00
snipe 7ca617f077
Merge pull request #11246 from snipe/fixes/clearer_placeholder_text_for_ldap 
Added explicit “Example:” text in placeholders
 2022-06-03 13:28:40 -07:00
snipe 8f5ac5fb55 Removed quotes around filter query 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 13:01:53 -07:00
snipe 54f828743e Merge remote-tracking branch 'origin/develop' 2022-06-03 12:54:13 -07:00
snipe f519fb747f
Merge pull request #11248 from snipe/fixes/corrected_gate_on_assetmodels 
Updated Asset Model gate to correctly display the button on view
 2022-06-03 12:53:52 -07:00
snipe 36f714e414 Updated Asset Model gate to correctly display the button on view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 12:52:53 -07:00
snipe 3071a83ae0 Added the validation strings for user creation password options 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 12:00:56 -07:00
snipe 1c4864a3cc Added explicit “Example:” text in placeholders 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 11:25:18 -07:00
snipe eebc56d54b Merge remote-tracking branch 'origin/develop' 2022-06-02 16:33:04 -07:00
snipe 4e03ebe284 Don’t use the formatted date for diff days in audit report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-02 16:30:26 -07:00
snipe 7577fc61e4
Merge pull request #11235 from Godmartinz/gh_5644-checkout_history_for_accessories 
fixed issue with misplaced div
 2022-06-01 17:03:23 -07:00
Godfrey M d302675056 fixed a div placement 2022-06-01 16:58:29 -07:00
Godfrey M 5316f41eba fixed a div placement 2022-06-01 16:56:01 -07:00
snipe fa6c463d46
Merge pull request #11046 from Godmartinz/gh_5644-checkout_history_for_accessories 
Added history tab to accessories
 2022-06-01 12:46:38 -07:00
snipe 23a441e7c8 Merge remote-tracking branch 'origin/develop' 2022-06-01 10:27:50 -07:00
snipe 1dbc1f4aa2 Fixed #11232 - missing closing div 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-01 10:26:26 -07:00
Achmad Fienan Rahardianto fe65de1207 implements cookie to maintain display preference 2022-06-01 11:54:05 +07:00
snipe 089704c4f9 Merge remote-tracking branch 'origin/develop' 2022-05-31 14:17:23 -07:00
Ivan Nieto Vivanco 3e44f39f4d Set the new File column as not visible by default 2022-05-25 19:19:25 -05:00
Ivan Nieto Vivanco f208869aff Add column to show filenames in Activity Report if the log action is 'uploaded' 2022-05-25 18:50:32 -05:00
snipe 2db6cf85a7 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-05-24 15:10:46 -07:00
snipe 5be7dee3d3 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 15:07:14 -07:00
snipe d8a8e03bf6 Nicer styling 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 14:39:01 -07:00
snipe a243823e5e
Merge pull request #11190 from inietov/fixes/requested_assets_models_workflow 
Adjust requested assets and models workflow a little bit.
 2022-05-24 14:31:40 -07:00
Ivan Nieto Vivanco a4cf601c98 Remove extra tag and other stylistic changes 2022-05-24 16:27:55 -05:00
Ivan Nieto Vivanco 1e3c0d597e Use @can view directive instead of @if superadmin 2022-05-24 15:53:26 -05:00
snipe 91822d2e45 Use shorter helper config method 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 13:26:29 -07:00
snipe 5d83516659 Fixed typoe on maintenance screen 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 13:15:01 -07:00
snipe 67616dbcf4 Updated language strings from activated to able to login 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 13:12:02 -07:00
snipe 4839985f38 Added forced space after admin/superadmin badge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 12:59:36 -07:00
Ivan Nieto Vivanco aa841a4674 Check permission before show links or not in requestable asset models view 2022-05-24 14:40:32 -05:00
Ivan Nieto Vivanco 6d1de73cad Fixes some html structure in the requested assets view 2022-05-24 14:06:05 -05:00
Ivan Nieto Vivanco 0a6626891e Add links to requestable Models' name 2022-05-24 13:36:13 -05:00
snipe 64eafb062e Fixed bug where username wasn’t showing for regular users 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 10:48:02 -07:00
snipe e34ea32a5e Fixed translation styring reference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-23 20:15:22 -07:00
snipe 8333089278
Merge pull request #11172 from snipe/rebased_added_gitkeep_to_to_eula_pdfs 
Accept asset/accessory improvements and fixes
 2022-05-23 12:59:01 -07:00
snipe 70344cc02e
Merge pull request #11149 from Godmartinz/gh11129_setting_disclosure_arrow 
Fixed #11129 - settings treeview won't stay active.
 2022-05-23 12:55:11 -07:00
Godfrey M 4adb990a5d removed line breaks and deadspace 2022-05-23 09:37:20 -07:00
Godfrey M 160a147a58 removed line breaks and deadspace 2022-05-23 09:35:19 -07:00
snipe bd384d3f10 Small formatting fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe f439970e7a Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe a37a576ee5 FIxed translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 2bd0679a81 A few more tweaks to PDFs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 8c64e7359a Added signature column, removed stored_eula_file column 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 14495cd1da Nicer PDF display 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 8449b5ca1e
Merge pull request #11160 from uberbrady/improve_default_custom_field_value_on_asset_create 
Fixed: #11098 - Smartly overwrite fields with default values for custom fields
 2022-05-18 16:12:12 -07:00
Brady Wetherington e4b24e17f3 Improve comments because the logic is complicated and unintuitive 2022-05-18 16:06:39 -07:00
Brady Wetherington 981741062b Try to intelligently overwrite fields with default values for custom field 2022-05-18 15:51:32 -07:00
snipe a55adfc0a1
Merge pull request #11152 from Godmartinz/link_inconsistentcies 
Thanks!
 2022-05-18 15:45:30 -07:00
snipe 891009dc67 Nicer formatting for buttons in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 15:35:57 -07:00
Godfrey M ab23e04c65 re-adds Request::is to setting categories 2022-05-18 14:33:41 -07:00
Godfrey M 877b1bd0a3 re-adds Request::is to setting categories 2022-05-18 14:31:03 -07:00
Godfrey M eaeb74c576 readded comment 2022-05-18 13:13:38 -07:00
Godfrey M 23891054dc removed dead space and unused namespace 2022-05-18 13:11:20 -07:00
Godfrey M cfc4c58da3 fixes the Settings Tree menu to remain active when opened 2022-05-18 13:06:06 -07:00
Godfrey M 0ed59753da updated less files for license details to adhere to dark skin themes 2022-05-18 10:55:57 -07:00
Godfrey M 75f5f3a0a8 fixes inconsistencies with links styling 2022-05-18 09:37:53 -07:00
Godfrey M 07679aa376 settings treeview won't stay active. still experimenting with potential solutions 2022-05-18 08:40:37 -07:00
snipe 4078e4e323 Added spinner onClick for file upload button on backups 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 02:40:32 -07:00
snipe ceffbb950f Fixed #11120 - custom fields not showing when textarea is present as field type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 00:47:22 -07:00
snipe 0f9559c1ff Fixed #11124 - updated maintenance page 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 19:01:37 -07:00
Travers Carter 1fc0adf7b7 Fixed #11126: don't entitise custom CSS on the labels view 2022-05-18 00:16:18 +10:00
snipe a973c0626e
Merge pull request #11114 from uberbrady/bad_header_label_for_size_in_backups 
We inadvertently used the wrong label for one of the headers
 2022-05-16 17:02:31 -07:00