mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-27 06:29:47 -08:00
9c8ca6af21
commite321aeabae
Merge:8ec99ff43
37568ae9e
Author: snipe <[email protected]> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # routes/web/fields.php # tests/unit/UserTest.php commit37568ae9ec
Merge:01a832169
32ad9050c
Author: snipe <[email protected]> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit32ad9050cf
Author: snipe <[email protected]> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit01a832169c
Merge:bcad49ce7
3c6883489
Author: snipe <[email protected]> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit3c6883489c
Author: snipe <[email protected]> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commitbcad49ce79
Author: snipe <[email protected]> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commitb5acca89d7
Author: snipe <[email protected]> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commite52919cf1b
Merge:714576be4
29f3a5c48
Author: snipe <[email protected]> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit29f3a5c48f
Author: snipe <[email protected]> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit134e8e6fb9
Author: snipe <[email protected]> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit714576be45
Merge:b999c50a2
512899294
Author: Brady Wetherington <[email protected]> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit5128992940
Author: Brady Wetherington <[email protected]> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit0291323502
Author: snipe <[email protected]> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commite0f6f9b839
Author: snipe <[email protected]> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commitf1a6308002
Author: snipe <[email protected]> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commitb999c50a2e
Merge:9ca20e496
e3906b245
Author: snipe <[email protected]> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commite3906b245c
Author: Godfrey M <[email protected]> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit9ca20e4964
Merge:e0644dbbf
456a74d88
Author: Brady Wetherington <[email protected]> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit456a74d88c
Author: Brady Wetherington <[email protected]> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit799c059070
Author: Brady Wetherington <[email protected]> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commitc62d43a778
Author: Brady Wetherington <[email protected]> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commitb725bd0fae
Author: Brady Wetherington <[email protected]> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commite0644dbbf6
Merge:5b6925b00
004ecad05
Author: Brady Wetherington <[email protected]> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit5b6925b00c
Author: snipe <[email protected]> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commitdf17a859bf
Author: snipe <[email protected]> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit24c43056ba
Author: snipe <[email protected]> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit606b7e905d
Author: snipe <[email protected]> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commitd73ddad477
Author: snipe <[email protected]> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit9a39cf721e
Merge:7410b1683
8994f3e15
Author: snipe <[email protected]> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit7410b16835
Merge:e955c983a
b09e7d19b
Author: Brady Wetherington <[email protected]> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit8994f3e15e
Author: andres <[email protected]> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commitd23f1a77ca
Author: andres <[email protected]> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commite955c983a3
Merge:2fa17ac18
eed41e454
Author: snipe <[email protected]> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commitb09e7d19b3
Author: Brady Wetherington <[email protected]> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit2fa17ac185
Merge:b90515437
3b1e46f72
Author: snipe <[email protected]> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit3b1e46f72b
Author: Godfrey Martinez <[email protected]> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit0c1a1de2a2
Author: Godfrey Martinez <[email protected]> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit20c9ae5818
Author: Godfrey M <[email protected]> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commiteed41e4549
Author: snipe <[email protected]> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commitb750f4754f
Author: snipe <[email protected]> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commitc17a06792a
Author: snipe <[email protected]> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit4f76cc6cfb
Author: snipe <[email protected]> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commitb905154373
Author: snipe <[email protected]> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commitdaf748e531
Author: snipe <[email protected]> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit799a93c46a
Author: snipe <[email protected]> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit34aa12e229
Merge:81a633288
897757bd0
Author: snipe <[email protected]> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit897757bd04
Author: snipe <[email protected]> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commitc7125c3937
Author: snipe <[email protected]> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit81a6332889
Author: snipe <[email protected]> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses commit6e563f6e4b
Merge:5320f5c67
7f69ae953
Author: snipe <[email protected]> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit5320f5c67c
Author: snipe <[email protected]> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit7f69ae953b
Merge:c79f8c1ba
17f6fbabf
Author: snipe <[email protected]> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit17f6fbabfa
Author: Brady Wetherington <[email protected]> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commitc79f8c1baf
Merge:12c92e30b
536401fe0
Author: snipe <[email protected]> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commite7a820f7c9
Author: Brady Wetherington <[email protected]> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit12c92e30b7
Author: snipe <[email protected]> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commitfd10b755b0
Author: snipe <[email protected]> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commitdbbb7680d9
Author: snipe <[email protected]> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commitcf0dd5bbad
Author: snipe <[email protected]> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit25e53d8c7f
Merge:ec6ed256f
89d433b41
Author: snipe <[email protected]> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit89d433b41a
Author: snipe <[email protected]> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commite2570ada6f
Author: snipe <[email protected]> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit45afe725a1
Author: snipe <[email protected]> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit536401fe0f
Author: EDVLeer <[email protected]> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commitec6ed256fb
Author: snipe <[email protected]> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit2aaa7bed2d
Merge:339bdddc3
cc9f1577a
Author: snipe <[email protected]> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commitcc9f1577a4
Author: snipe <[email protected]> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commitab1fe8be0c
Author: snipe <[email protected]> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit339bdddc38
Author: snipe <[email protected]> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit35b9cf4b70
Author: snipe <[email protected]> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit7ccb41371e
Author: snipe <[email protected]> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit2e60a457bf
Author: snipe <[email protected]> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit2390d2160b
Merge:b42801f6a
00b051b8c
Author: snipe <[email protected]> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit00b051b8c7
Author: snipe <[email protected]> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit05b3a9ad7e
Author: snipe <[email protected]> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit4fb880384f
Author: snipe <[email protected]> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit43042ad841
Author: snipe <[email protected]> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commita716382ac4
Author: snipe <[email protected]> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit36c8f7f4f1
Author: snipe <[email protected]> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commitb42801f6ae
Merge:de4934f21
946129f20
Author: snipe <[email protected]> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit946129f206
Author: snipe <[email protected]> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commitb941ef1e08
Author: snipe <[email protected]> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commitd1aa11ec89
Author: snipe <[email protected]> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commitde4934f21d
Merge:af06e4205
b10076b01
Author: snipe <[email protected]> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings commitb10076b015
Author: Godfrey M <[email protected]> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commitaf06e42056
Author: snipe <[email protected]> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit9a2440dc4b
Merge:beae8efb2
2ac1c1636
Author: snipe <[email protected]> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid Better handle the logic to determine if we should display the license checkout blade [ch13792] commit2ac1c1636c
Author: snipe <[email protected]> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit004ecad059
Author: Peter Upfold <[email protected]> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commitbeae8efb21
Merge:d14ab7e3e
9839e5e56
Author: snipe <[email protected]> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit9839e5e566
Author: Godfrey M <[email protected]> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commitd14ab7e3e1
Author: snipe <[email protected]> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <[email protected]> commite7f74d94c1
Author: Godfrey M <[email protected]> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commite97cf011b6
Author: Godfrey M <[email protected]> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commited23505054
Author: Godfrey M <[email protected]> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit001e721530
Merge:f88683766
8210da6e8
Author: snipe <[email protected]> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit8210da6e82
Author: Daniel Meltzer <[email protected]> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commitf88683766b
Author: snipe <[email protected]> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <[email protected]> commite4385c0f8c
Author: snipe <[email protected]> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <[email protected]> commit0550fe0ffa
Author: snipe <[email protected]> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <[email protected]> commit7fb3a9b82c
Merge:9a2ed804c
ecb1e87fe
Author: snipe <[email protected]> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commitecb1e87fe6
Author: snipe <[email protected]> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <[email protected]> commitf43df5f041
Author: snipe <[email protected]> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <[email protected]> commit95cc48e422
Author: snipe <[email protected]> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <[email protected]> commit9a2ed804ca
Author: snipe <[email protected]> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <[email protected]> commitd20fad28e5
Author: snipe <[email protected]> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <[email protected]> commitae813ddf75
Author: snipe <[email protected]> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commitbb42109c0c
Author: snipe <[email protected]> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <[email protected]> commitf46ecf8ec0
Author: snipe <[email protected]> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <[email protected]> commitb9e821c0e6
Author: snipe <[email protected]> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <[email protected]> commit9ee28c7513
Author: snipe <[email protected]> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <[email protected]> commit1a8ba06702
Merge:0fd232e70
ee4d69b1c
Author: snipe <[email protected]> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit0fd232e70d
Author: snipe <[email protected]> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <[email protected]> commitee4d69b1c5
Merge:31c535094
d1ad11194
Author: snipe <[email protected]> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commitd1ad111949
Author: Alexander Chibrikin <[email protected]> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see https://github.com/maknz/slack/issues/94 commit31c5350941
Author: snipe <[email protected]> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <[email protected]> commit7eb70e17e0
Merge:5bb4f271a
3dfcb4699
Author: snipe <[email protected]> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit3dfcb46991
Author: snipe <[email protected]> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <[email protected]> commit96eb96f964
Author: snipe <[email protected]> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <[email protected]> commita2f08bd3ba
Author: snipe <[email protected]> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <[email protected]> commite009fbe59f
Author: snipe <[email protected]> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <[email protected]> commit5bb4f271aa
Author: snipe <[email protected]> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <[email protected]>
1 line
12 KiB
Plaintext
1 line
12 KiB
Plaintext
{"version":3,"sources":["webpack:///./resources/assets/less/overrides.less"],"names":[],"mappings":"AAAA,6OAkBE,yBAEF,mBACE,qBACA,mBACA,gBACA,cACA,WACA,iFACE,WAGJ,MACE,eAGF,UACI,kBACA,gBAGJ,oBACI,cAIJ,iBACA,kBACA,aACA,mBACA,kBACA,8BACA,WACA,YAGA,mBACE,WACA,WACA,YACA,kBACA,kBAGF,gCACE,yBAGF,mBACI,WAGJ,kBACE,aACA,YAIF,QACE,kBAGF,2BACI,kBACA,MACA,QACA,eACA,gBACA,gBACA,iBACA,wBACA,UACA,aACA,gBACA,eACA,cAEJ,aACE,eAEF,aACE,iBAIF,sCACE,cAEF,mBACE,qBAIF,gBACE,kBACA,YACA,yBAGF,uBACE,YACA,WACA,iBAwBF,oCACE,eAAS,CAGX,sBACE,aACA,aAIF,mBACE,WAEF,aACE,cACA,mCAGF,wBACE,cACA,cAGF,0BACQ,mBACA,kBAEN,yBACI,iBAGN,aACE,cACA,6BACA,8CAGF,yBACE,cAGF,yBACE,cAGF,sBACE,cAGF,yBACE,cAGF,wBACE,cAGF,uJACE,WAGF,eACC,eACA,MACA,aACA,YACA,YACA,gBACA,YACC,iBACA,WACA,aAEF,kBACC,kBACA,YACA,WACA,gBACA,gBACA,6BAED,qCACC,kBACA,SACA,WACA,qBACA,oBACA,6BACA,gBACA,cACA,gBACA,WACA,qBACA,mBAED,2CACC,WAED,kBACC,gBACA,gBACA,6BACA,gCAED,qBACC,6BACA,gCAED,uBACC,kBACA,cACA,aACA,WACA,qBAED,6BACC,gBACA,WAED,yBACC,kBACA,SACA,WACA,WAGA,iBACE,eACA,aAKF,WAAY,gBAGA,gCAAkC,iBAC9C,2BAA8B,UAAY,kBAE1C,8CAAiD,cAAgB,eAAiB,kBAClF,2CAA8C,WAAa,eAC3D,0CAA+C,kBAAoB,WAAa,YAAc,cAAgB,mBAAqB,SAAW,SAAW,iBAAmB,kBAAoB,kBAChM,gDAAqD,YAAc,WAAa,YAAc,mBAAqB,mBAAqB,kBAAoB,QAAU,SACtK,qCAA0C,kBAAoB,gBAAoB,WAAa,wCAAkB,cACjH,mDAA0D,QAAW,wCAAkB,mBACvF,4DAAmE,WACnE,0DAAiE,UACjE,sEAA6E,QAC7E,qEAA4E,WAC5E,mDAAwD,yBACxD,yDAA8D,UAC9D,iDAAuD,SAAW,UAClE,gDAAsD,UACtD,oDAAuD,oBAGxD,eACE,qBACA,WACA,gBACA,WACA,UAIF,mQAkBE,WAGF,wBACC,6BAID,UACE,8BAGF,KACE,oIAIA,eAGF,cACE,eACA,mBAGF,aACE,cACE,aAGF,uBACE,wBACA,oBACA,8BAIJ,uCACE,WACA,sBACA,gBAGF,iBACE,gBAGF,8BACE,eAGF,SACE,uBAGF,SACE,gBAGF,eACE,qBACA,CAIF,UACE,eACA,cAGF,YACE,iBACA,oBACA,gBAIF,YACE,YACA,kBACA,SACA,UACA,WACA,gBACA,aAEF,qCACE,WACA,sBACA,UACA,SACA,UACA,YACA,cACA,gBACA,YACA,mBACA,sBACA,kBACA,gBACA,YAGF,GACE,eAGF,GACE,eAGF,GACE,eAIF,aACE,mBACA,gBACA,UACA,iBACA,oDAGA,cAIF,uCACE,yBACA,0BACA,mBAIF,sCACE,gBACA,0BACA,mBAoBF,yGAKE,YACA,wBACA,gBACA,oBACA,mCACA,kCAIF,qKAOE,qBACA,6CACA,eAGF,gCAEE,gBACA,kBAGF,gCAEE,eAAS,CAGX,gCAEE,eAAS,CAGX,mCAEE,eAAS,CAGX,kCAEE,eAAS","file":"css/overrides.css","sourcesContent":[".skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n\n.logo {\n background-color: inherit;\n}\n.main-header .logo {\n width: 100% !important;\n white-space: nowrap;\n text-align: left;\n display: block;\n clear: both;\n &a:link, a:hover, a:visited {\n color: #fff\n }\n}\n.huge {\n font-size: 40px;\n}\n\n.btn-file {\n position: relative;\n overflow: hidden;\n}\n\n.dropdown-menu>li>a {\n color: #354044;\n}\n\n\n#sort tr.cansort {\nborder-radius: 2px;\npadding: 10px;\nbackground: #f4f4f4;\nmargin-bottom: 3px;\nborder-left: 2px solid #e6e7e8;\ncolor: #444;\ncursor: move;\n}\n\n.user-image-inline {\n float: left;\n width: 25px;\n height: 25px;\n border-radius: 50%;\n margin-right: 10px;\n}\n\n.input-group .input-group-addon {\n background-color: #f4f4f4;\n}\n\na.accordion-header {\n color: #333;\n}\n\n.dynamic-form-row {\n padding: 10px;\n margin: 20px;\n}\n\n\n.handle {\n padding-left: 10px;\n}\n\n.btn-file input[type=file] {\n position: absolute;\n top: 0;\n right: 0;\n min-width: 100%;\n min-height: 100%;\n font-size: 100px;\n text-align: right;\n filter: alpha(opacity=0);\n opacity: 0;\n outline: none;\n background: white;\n cursor: inherit;\n display: block;\n}\n.main-footer {\n font-size: 13px;\n}\n.main-header {\n max-height: 150px;\n}\n\n\n.navbar-nav>.user-menu>.dropdown-menu {\n width: inherit;\n}\n.main-header .logo {\n padding: 0px 5px 0px 15px;\n}\n\n\n.sidebar-toggle {\n margin-left: -48px;\n z-index: 100;\n background-color: inherit;\n}\n\n.sidebar-toggle-mobile {\n z-index: 100;\n width: 50px;\n padding-top: 10px;\n}\n\n.skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n.navbar\n.dropdown-menu li a {\n //color: inherit;\n}\n\n.main-header .sidebar-toggle:before {\n content: \"\\f0c9\";\n}\n\n.direct-chat-contacts {\n padding: 10px;\n height: 150px;\n}\n\n\n.select2-container {\n width: 100%;\n}\n.error input {\n color: #dd4b39;\n border: 2px solid #dd4b39 !important;\n}\n\n.error label, .alert-msg {\n color: #dd4b39;\n display: block;\n}\n\n.input-group[class*=\"col-\"] {\n padding-right: 15px;\n padding-left: 15px;\n }\n .control-label.multiline {\n padding-top: 10px;\n }\n\n.btn-outline {\n color: inherit;\n background-color: transparent;\n transition: all .5s;\n}\n\n.btn-primary.btn-outline {\n color: #428bca;\n}\n\n.btn-success.btn-outline {\n color: #5cb85c;\n}\n\n.btn-info.btn-outline {\n color: #5bc0de;\n}\n\n.btn-warning.btn-outline {\n color: #f0ad4e;\n}\n\n.btn-danger.btn-outline {\n color: #d9534f;\n}\n\n.btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, .btn-info.btn-outline:hover, .btn-warning.btn-outline:hover, .btn-danger.btn-outline:hover {\n color: #fff;\n}\n\n.slideout-menu {\n\tposition: fixed;\n\ttop: 0;\n\tright: -250px;\n\twidth: 250px;\n\theight: 100%;\n\tbackground: #333;\n\tz-index: 100;\n margin-top: 100px;\n color: white;\n padding: 10px;\n}\n.slideout-menu h3 {\n\tposition: relative;\n\tpadding: 5px 5px;\n\tcolor: #fff;\n\tfont-size: 1.2em;\n\tfont-weight: 400;\n\tborder-bottom: 4px solid #222;\n}\n.slideout-menu .slideout-menu-toggle {\n\tposition: absolute;\n\ttop: 12px;\n\tright: 10px;\n\tdisplay: inline-block;\n\tpadding: 6px 9px 5px;\n\tfont-family: Arial, sans-serif;\n\tfont-weight: bold;\n\tline-height: 1;\n\tbackground: #222;\n\tcolor: #999;\n\ttext-decoration: none;\n\tvertical-align: top;\n}\n.slideout-menu .slideout-menu-toggle:hover {\n\tcolor: #fff;\n}\n.slideout-menu ul {\n\tlist-style: none;\n\tfont-weight: 300;\n\tborder-top: 1px solid #151515;\n\tborder-bottom: 1px solid #454545;\n}\n.slideout-menu ul li {\n\tborder-top: 1px solid #454545;\n\tborder-bottom: 1px solid #151515;\n}\n.slideout-menu ul li a {\n\tposition: relative;\n\tdisplay: block;\n\tpadding: 10px;\n\tcolor: #999;\n\ttext-decoration: none;\n}\n.slideout-menu ul li a:hover {\n\tbackground: #000;\n\tcolor: #fff;\n}\n.slideout-menu ul li a i {\n\tposition: absolute;\n\ttop: 15px;\n\tright: 10px;\n\topacity: .5;\n}\n\n .btn-box-tool-lg {\n font-size: 16px;\n color: orange;\n }\n\n\n\n .bs-wizard {margin-top: 20px;}\n\n /*Form Wizard*/\n .bs-wizard {border-bottom: solid 1px #e0e0e0; padding: 0 0 10px 0;}\n .bs-wizard > .bs-wizard-step {padding: 0; position: relative;}\n .bs-wizard > .bs-wizard-step + .bs-wizard-step {}\n .bs-wizard > .bs-wizard-step .bs-wizard-stepnum {color: #595959; font-size: 16px; margin-bottom: 5px;}\n .bs-wizard > .bs-wizard-step .bs-wizard-info {color: #999; font-size: 14px;}\n .bs-wizard > .bs-wizard-step > .bs-wizard-dot {position: absolute; width: 30px; height: 30px; display: block; background: #fbe8aa; top: 45px; left: 50%; margin-top: -15px; margin-left: -15px; border-radius: 50%;}\n .bs-wizard > .bs-wizard-step > .bs-wizard-dot:after {content: ' '; width: 14px; height: 14px; background: #fbbd19; border-radius: 50px; position: absolute; top: 8px; left: 8px; }\n .bs-wizard > .bs-wizard-step > .progress {position: relative; border-radius: 0px; height: 8px; box-shadow: none; margin: 20px 0;}\n .bs-wizard > .bs-wizard-step > .progress > .progress-bar {width:0px; box-shadow: none; background: #fbe8aa;}\n .bs-wizard > .bs-wizard-step.complete > .progress > .progress-bar {width:100%;}\n .bs-wizard > .bs-wizard-step.active > .progress > .progress-bar {width:50%;}\n .bs-wizard > .bs-wizard-step:first-child.active > .progress > .progress-bar {width:0%;}\n .bs-wizard > .bs-wizard-step:last-child.active > .progress > .progress-bar {width: 100%;}\n .bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot {background-color: #f5f5f5;}\n .bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot:after {opacity: 0;}\n .bs-wizard > .bs-wizard-step:first-child > .progress {left: 50%; width: 50%;}\n .bs-wizard > .bs-wizard-step:last-child > .progress {width: 50%;}\n .bs-wizard > .bs-wizard-step.disabled a.bs-wizard-dot{ pointer-events: none; }\n /*END Form Wizard*/\n\n.left-navblock {\n display: inline-block;\n float: left;\n text-align: left;\n color: white;\n padding: 0px;\n /* adjust based on your layout */\n\n}\n.skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n.navbar\n.dropdown-menu li a {\n color: #333;\n}\n\na.logo.no-hover a:hover {\n background-color: transparent;\n}\n\n\n.required {\n border-right: 6px solid orange;\n}\n\nbody {\n font-family: -apple-system, BlinkMacSystemFont,\n \"Segoe UI\", \"Roboto\", \"Oxygen\", \"Ubuntu\", \"Cantarell\",\n \"Fira Sans\", \"Droid Sans\", \"Helvetica Neue\",\n sans-serif;\n font-size: 13px;\n}\n\n.sidebar-menu {\n font-size: 14px;\n white-space: normal;\n}\n\n@media print {\n a[href]:after {\n content: none;\n }\n\n .tab-content > .tab-pane {\n display: block !important;\n opacity: 1 !important;\n visibility: visible !important;\n }\n}\n\nimg.navbar-brand-img, .navbar-brand>img {\n float: left;\n padding: 5px 5px 5px 0;\n max-height: 50px;\n}\n\n.input-daterange {\n border-radius: 0px;\n}\n\n.btn.bg-maroon, .btn.bg-purple{\n min-width:90px;\n}\n\n[hidden] {\n display: none !important;\n}\n\n#toolbar {\n margin-top: 10px;\n}\n\n#uploadPreview {\n border-color: grey;\n border-width: 1px;\n border-style: solid\n}\n\n.icon-med {\n font-size: 20px;\n color: #889195;\n}\n\n#login-logo {\n padding-top: 20px;\n padding-bottom: 10px;\n max-width: 200px\n}\n\n// accessibility skip link\na.skip-main {\n left:-999px;\n position:absolute;\n top:auto;\n width:1px;\n height:1px;\n overflow:hidden;\n z-index:-999;\n}\na.skip-main:focus, a.skip-main:active {\n color: #fff;\n background-color:#000;\n left: auto;\n top: auto;\n width: 30%;\n height: auto;\n overflow:auto;\n margin: 10px 35%;\n padding:5px;\n border-radius: 15px;\n border:4px solid yellow;\n text-align:center;\n font-size:1.2em;\n z-index:999;\n}\n\nh2 {\n font-size: 22px;\n}\n\nh3 {\n font-size: 20px;\n}\n\nh4 {\n font-size: 16px;\n}\n\n\n.row-striped {\n vertical-align: top;\n line-height: 2.6;\n padding: 0px;\n margin-left: 20px;\n box-sizing: border-box;\n //border-left: 1px solid #dddddd;\n //border-right: 1px solid #dddddd;\n display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n background-color: #f9f9f9;\n border-top: 1px solid #dddddd;\n display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n background: #FFFFFF;\n border-top: 1px solid #dddddd;\n display: table-cell;\n}\n\n\n\n\n/**\n\n COLUMN SELECTOR ICONS\n -----------------------------\n This is kind of weird, but it is necessary to prevent the column-selector code from barfing, since\n any HTML used in the UserPresenter \"title\" attribute breaks the column selector HTML.\n\n Instead, we use CSS to add the icon into the table header, which leaves the column selector\n \"title\" text as-is.\n\n See https://github.com/snipe/snipe-it/issues/7989\n\n */\n\nth.css-barcode > .th-inner,\nth.css-license > .th-inner,\nth.css-consumable > .th-inner,\nth.css-accessory > .th-inner\n{\n font-size: 0px;\n line-height: 4!important;\n text-align: left;\n text-rendering: auto;\n -webkit-font-smoothing: antialiased;\n -moz-osx-font-smoothing: grayscale;\n}\n\n\nth.css-padlock > .th-inner::before,\nth.css-barcode > .th-inner::before,\nth.css-license > .th-inner::before,\nth.css-consumable > .th-inner::before,\nth.css-accessory > .th-inner::before\n\n{\n display: inline-block;\n font: normal normal normal 14px/1 FontAwesome;\n font-size: 20px;\n}\n\nth.css-padlock > .th-inner::before\n{\n content: \"\\f023\";\n padding-right: 2px;\n}\n\nth.css-barcode > .th-inner::before\n{\n content: \"\\f02a\";\n}\n\nth.css-license > .th-inner::before\n{\n content: \"\\f0c7\";\n}\n\nth.css-consumable > .th-inner::before\n{\n content: \"\\f043\";\n}\n\nth.css-accessory > .th-inner::before\n{\n content: \"\\f11c\";\n}\n\n\n// WEBPACK FOOTER //\n// ./resources/assets/less/overrides.less"],"sourceRoot":""} |