mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-21 08:17:48 -07:00
9c8ca6af21
commite321aeabae
Merge:8ec99ff43
37568ae9e
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> 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 <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit01a832169c
Merge:bcad49ce7
3c6883489
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commitbcad49ce79
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commitb5acca89d7
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commite52919cf1b
Merge:714576be4
29f3a5c48
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit134e8e6fb9
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit714576be45
Merge:b999c50a2
512899294
Author: Brady Wetherington <bwetherington@grokability.com> 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 <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit0291323502
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commite0f6f9b839
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commitf1a6308002
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> 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 <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit9ca20e4964
Merge:e0644dbbf
456a74d88
Author: Brady Wetherington <bwetherington@grokability.com> 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 <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit799c059070
Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commitc62d43a778
Author: Brady Wetherington <uberbrady@gmail.com> 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 <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commite0644dbbf6
Merge:5b6925b00
004ecad05
Author: Brady Wetherington <bwetherington@grokability.com> 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 <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commitdf17a859bf
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> 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 <snipe@snipe.net> 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 <snipe@snipe.net> 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 <snipe@snipe.net> 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 <bwetherington@grokability.com> 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 <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commitd23f1a77ca
Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commite955c983a3
Merge:2fa17ac18
eed41e454
Author: snipe <snipe@snipe.net> 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 <uberbrady@gmail.com> 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 <snipe@snipe.net> 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 <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit0c1a1de2a2
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit20c9ae5818
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commiteed41e4549
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commitb750f4754f
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commitc17a06792a
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit4f76cc6cfb
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commitb905154373
Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commitdaf748e531
Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit799a93c46a
Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit34aa12e229
Merge:81a633288
897757bd0
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commitc7125c3937
Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit81a6332889
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit5320f5c67c
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit7f69ae953b
Merge:c79f8c1ba
17f6fbabf
Author: snipe <snipe@snipe.net> 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 <uberbrady@gmail.com> 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 <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commite7a820f7c9
Author: Brady Wetherington <uberbrady@gmail.com> 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 <snipe@snipe.net> 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 <snipe@snipe.net> 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 <snipe@snipe.net> 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 <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit25e53d8c7f
Merge:ec6ed256f
89d433b41
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commite2570ada6f
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit45afe725a1
Author: snipe <snipe@snipe.net> 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 <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commitec6ed256fb
Author: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit2aaa7bed2d
Merge:339bdddc3
cc9f1577a
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commitcc9f1577a4
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commitab1fe8be0c
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit339bdddc38
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit35b9cf4b70
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit7ccb41371e
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit2390d2160b
Merge:b42801f6a
00b051b8c
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit05b3a9ad7e
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit4fb880384f
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit43042ad841
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commita716382ac4
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit36c8f7f4f1
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commitb42801f6ae
Merge:de4934f21
946129f20
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commitb941ef1e08
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> 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 <snipe@snipe.net> 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 <godmartinz@gmail.com> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commitaf06e42056
Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit9a2440dc4b
Merge:beae8efb2
2ac1c1636
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> 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 <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commitbeae8efb21
Merge:d14ab7e3e
9839e5e56
Author: snipe <snipe@snipe.net> 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 <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commitd14ab7e3e1
Author: snipe <snipe@snipe.net> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <snipe@snipe.net> commite7f74d94c1
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commite97cf011b6
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commited23505054
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit001e721530
Merge:f88683766
8210da6e8
Author: snipe <snipe@snipe.net> 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 <dmeltzer.devel@gmail.com> 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 <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commite4385c0f8c
Author: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit0550fe0ffa
Author: snipe <snipe@snipe.net> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <snipe@snipe.net> commit7fb3a9b82c
Merge:9a2ed804c
ecb1e87fe
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commitf43df5f041
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit95cc48e422
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net> commit9a2ed804ca
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <snipe@snipe.net> commitd20fad28e5
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <snipe@snipe.net> commitae813ddf75
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commitbb42109c0c
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commitf46ecf8ec0
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commitb9e821c0e6
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <snipe@snipe.net> commit9ee28c7513
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <snipe@snipe.net> commit1a8ba06702
Merge:0fd232e70
ee4d69b1c
Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit0fd232e70d
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> commitee4d69b1c5
Merge:31c535094
d1ad11194
Author: snipe <snipe@snipe.net> 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 <alek13.me@gmail.com> 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 <snipe@snipe.net> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <snipe@snipe.net> commit7eb70e17e0
Merge:5bb4f271a
3dfcb4699
Author: snipe <snipe@snipe.net> 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 <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit96eb96f964
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commita2f08bd3ba
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commite009fbe59f
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <snipe@snipe.net> commit5bb4f271aa
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <snipe@snipe.net>
555 lines
9.9 KiB
Plaintext
555 lines
9.9 KiB
Plaintext
.skin-red
|
|
.skin-purple
|
|
.skin-blue
|
|
.skin-black
|
|
.skin-orange
|
|
.skin-yellow
|
|
.skin-green
|
|
.skin-red-dark
|
|
.skin-purple-dark
|
|
.skin-blue-dark
|
|
.skin-black-dark
|
|
.skin-orange-dark
|
|
.skin-yellow-dark
|
|
.skin-green-dark
|
|
.skin-contrast
|
|
.main-header
|
|
|
|
.logo {
|
|
background-color: inherit;
|
|
}
|
|
.main-header .logo {
|
|
width: 100% !important;
|
|
white-space: nowrap;
|
|
text-align: left;
|
|
display: block;
|
|
clear: both;
|
|
&a:link, a:hover, a:visited {
|
|
color: #fff
|
|
}
|
|
}
|
|
.huge {
|
|
font-size: 40px;
|
|
}
|
|
|
|
.btn-file {
|
|
position: relative;
|
|
overflow: hidden;
|
|
}
|
|
|
|
.dropdown-menu>li>a {
|
|
color: #354044;
|
|
}
|
|
|
|
|
|
#sort tr.cansort {
|
|
border-radius: 2px;
|
|
padding: 10px;
|
|
background: #f4f4f4;
|
|
margin-bottom: 3px;
|
|
border-left: 2px solid #e6e7e8;
|
|
color: #444;
|
|
cursor: move;
|
|
}
|
|
|
|
.user-image-inline {
|
|
float: left;
|
|
width: 25px;
|
|
height: 25px;
|
|
border-radius: 50%;
|
|
margin-right: 10px;
|
|
}
|
|
|
|
.input-group .input-group-addon {
|
|
background-color: #f4f4f4;
|
|
}
|
|
|
|
a.accordion-header {
|
|
color: #333;
|
|
}
|
|
|
|
.dynamic-form-row {
|
|
padding: 10px;
|
|
margin: 20px;
|
|
}
|
|
|
|
|
|
.handle {
|
|
padding-left: 10px;
|
|
}
|
|
|
|
.btn-file input[type=file] {
|
|
position: absolute;
|
|
top: 0;
|
|
right: 0;
|
|
min-width: 100%;
|
|
min-height: 100%;
|
|
font-size: 100px;
|
|
text-align: right;
|
|
filter: alpha(opacity=0);
|
|
opacity: 0;
|
|
outline: none;
|
|
background: white;
|
|
cursor: inherit;
|
|
display: block;
|
|
}
|
|
.main-footer {
|
|
font-size: 13px;
|
|
}
|
|
.main-header {
|
|
max-height: 150px;
|
|
}
|
|
|
|
|
|
.navbar-nav>.user-menu>.dropdown-menu {
|
|
width: inherit;
|
|
}
|
|
.main-header .logo {
|
|
padding: 0px 5px 0px 15px;
|
|
}
|
|
|
|
|
|
.sidebar-toggle {
|
|
margin-left: -48px;
|
|
z-index: 100;
|
|
background-color: inherit;
|
|
}
|
|
|
|
.sidebar-toggle-mobile {
|
|
z-index: 100;
|
|
width: 50px;
|
|
padding-top: 10px;
|
|
}
|
|
|
|
.skin-red
|
|
.skin-purple
|
|
.skin-blue
|
|
.skin-black
|
|
.skin-orange
|
|
.skin-yellow
|
|
.skin-green
|
|
.skin-red-dark
|
|
.skin-purple-dark
|
|
.skin-blue-dark
|
|
.skin-black-dark
|
|
.skin-orange-dark
|
|
.skin-yellow-dark
|
|
.skin-green-dark
|
|
.skin-contrast
|
|
.main-header
|
|
.navbar
|
|
.dropdown-menu li a {
|
|
//color: inherit;
|
|
}
|
|
|
|
.main-header .sidebar-toggle:before {
|
|
content: "\f0c9";
|
|
}
|
|
|
|
.direct-chat-contacts {
|
|
padding: 10px;
|
|
height: 150px;
|
|
}
|
|
|
|
|
|
.select2-container {
|
|
width: 100%;
|
|
}
|
|
.error input {
|
|
color: #dd4b39;
|
|
border: 2px solid #dd4b39 !important;
|
|
}
|
|
|
|
.error label, .alert-msg {
|
|
color: #dd4b39;
|
|
display: block;
|
|
}
|
|
|
|
.input-group[class*="col-"] {
|
|
padding-right: 15px;
|
|
padding-left: 15px;
|
|
}
|
|
.control-label.multiline {
|
|
padding-top: 10px;
|
|
}
|
|
|
|
.btn-outline {
|
|
color: inherit;
|
|
background-color: transparent;
|
|
transition: all .5s;
|
|
}
|
|
|
|
.btn-primary.btn-outline {
|
|
color: #428bca;
|
|
}
|
|
|
|
.btn-success.btn-outline {
|
|
color: #5cb85c;
|
|
}
|
|
|
|
.btn-info.btn-outline {
|
|
color: #5bc0de;
|
|
}
|
|
|
|
.btn-warning.btn-outline {
|
|
color: #f0ad4e;
|
|
}
|
|
|
|
.btn-danger.btn-outline {
|
|
color: #d9534f;
|
|
}
|
|
|
|
.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 {
|
|
color: #fff;
|
|
}
|
|
|
|
.slideout-menu {
|
|
position: fixed;
|
|
top: 0;
|
|
right: -250px;
|
|
width: 250px;
|
|
height: 100%;
|
|
background: #333;
|
|
z-index: 100;
|
|
margin-top: 100px;
|
|
color: white;
|
|
padding: 10px;
|
|
}
|
|
.slideout-menu h3 {
|
|
position: relative;
|
|
padding: 5px 5px;
|
|
color: #fff;
|
|
font-size: 1.2em;
|
|
font-weight: 400;
|
|
border-bottom: 4px solid #222;
|
|
}
|
|
.slideout-menu .slideout-menu-toggle {
|
|
position: absolute;
|
|
top: 12px;
|
|
right: 10px;
|
|
display: inline-block;
|
|
padding: 6px 9px 5px;
|
|
font-family: Arial, sans-serif;
|
|
font-weight: bold;
|
|
line-height: 1;
|
|
background: #222;
|
|
color: #999;
|
|
text-decoration: none;
|
|
vertical-align: top;
|
|
}
|
|
.slideout-menu .slideout-menu-toggle:hover {
|
|
color: #fff;
|
|
}
|
|
.slideout-menu ul {
|
|
list-style: none;
|
|
font-weight: 300;
|
|
border-top: 1px solid #151515;
|
|
border-bottom: 1px solid #454545;
|
|
}
|
|
.slideout-menu ul li {
|
|
border-top: 1px solid #454545;
|
|
border-bottom: 1px solid #151515;
|
|
}
|
|
.slideout-menu ul li a {
|
|
position: relative;
|
|
display: block;
|
|
padding: 10px;
|
|
color: #999;
|
|
text-decoration: none;
|
|
}
|
|
.slideout-menu ul li a:hover {
|
|
background: #000;
|
|
color: #fff;
|
|
}
|
|
.slideout-menu ul li a i {
|
|
position: absolute;
|
|
top: 15px;
|
|
right: 10px;
|
|
opacity: .5;
|
|
}
|
|
|
|
.btn-box-tool-lg {
|
|
font-size: 16px;
|
|
color: orange;
|
|
}
|
|
|
|
|
|
|
|
.bs-wizard {margin-top: 20px;}
|
|
|
|
/*Form Wizard*/
|
|
.bs-wizard {border-bottom: solid 1px #e0e0e0; padding: 0 0 10px 0;}
|
|
.bs-wizard > .bs-wizard-step {padding: 0; position: relative;}
|
|
.bs-wizard > .bs-wizard-step + .bs-wizard-step {}
|
|
.bs-wizard > .bs-wizard-step .bs-wizard-stepnum {color: #595959; font-size: 16px; margin-bottom: 5px;}
|
|
.bs-wizard > .bs-wizard-step .bs-wizard-info {color: #999; font-size: 14px;}
|
|
.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%;}
|
|
.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; }
|
|
.bs-wizard > .bs-wizard-step > .progress {position: relative; border-radius: 0px; height: 8px; box-shadow: none; margin: 20px 0;}
|
|
.bs-wizard > .bs-wizard-step > .progress > .progress-bar {width:0px; box-shadow: none; background: #fbe8aa;}
|
|
.bs-wizard > .bs-wizard-step.complete > .progress > .progress-bar {width:100%;}
|
|
.bs-wizard > .bs-wizard-step.active > .progress > .progress-bar {width:50%;}
|
|
.bs-wizard > .bs-wizard-step:first-child.active > .progress > .progress-bar {width:0%;}
|
|
.bs-wizard > .bs-wizard-step:last-child.active > .progress > .progress-bar {width: 100%;}
|
|
.bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot {background-color: #f5f5f5;}
|
|
.bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot:after {opacity: 0;}
|
|
.bs-wizard > .bs-wizard-step:first-child > .progress {left: 50%; width: 50%;}
|
|
.bs-wizard > .bs-wizard-step:last-child > .progress {width: 50%;}
|
|
.bs-wizard > .bs-wizard-step.disabled a.bs-wizard-dot{ pointer-events: none; }
|
|
/*END Form Wizard*/
|
|
|
|
.left-navblock {
|
|
display: inline-block;
|
|
float: left;
|
|
text-align: left;
|
|
color: white;
|
|
padding: 0px;
|
|
/* adjust based on your layout */
|
|
|
|
}
|
|
.skin-red
|
|
.skin-purple
|
|
.skin-blue
|
|
.skin-black
|
|
.skin-orange
|
|
.skin-yellow
|
|
.skin-green
|
|
.skin-red-dark
|
|
.skin-purple-dark
|
|
.skin-blue-dark
|
|
.skin-black-dark
|
|
.skin-orange-dark
|
|
.skin-yellow-dark
|
|
.skin-green-dark
|
|
.skin-contrast
|
|
.main-header
|
|
.navbar
|
|
.dropdown-menu li a {
|
|
color: #333;
|
|
}
|
|
|
|
a.logo.no-hover a:hover {
|
|
background-color: transparent;
|
|
}
|
|
|
|
|
|
.required {
|
|
border-right: 6px solid orange;
|
|
}
|
|
|
|
body {
|
|
font-family: -apple-system, BlinkMacSystemFont,
|
|
"Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
|
|
"Fira Sans", "Droid Sans", "Helvetica Neue",
|
|
sans-serif;
|
|
font-size: 13px;
|
|
}
|
|
|
|
.sidebar-menu {
|
|
font-size: 14px;
|
|
white-space: normal;
|
|
}
|
|
|
|
@media print {
|
|
a[href]:after {
|
|
content: none;
|
|
}
|
|
|
|
.tab-content > .tab-pane {
|
|
display: block !important;
|
|
opacity: 1 !important;
|
|
visibility: visible !important;
|
|
}
|
|
}
|
|
|
|
img.navbar-brand-img, .navbar-brand>img {
|
|
float: left;
|
|
padding: 5px 5px 5px 0;
|
|
max-height: 50px;
|
|
}
|
|
|
|
.input-daterange {
|
|
border-radius: 0px;
|
|
}
|
|
|
|
.btn.bg-maroon, .btn.bg-purple{
|
|
min-width:90px;
|
|
}
|
|
|
|
[hidden] {
|
|
display: none !important;
|
|
}
|
|
|
|
#toolbar {
|
|
margin-top: 10px;
|
|
}
|
|
|
|
#uploadPreview {
|
|
border-color: grey;
|
|
border-width: 1px;
|
|
border-style: solid
|
|
}
|
|
|
|
.icon-med {
|
|
font-size: 20px;
|
|
color: #889195;
|
|
}
|
|
|
|
#login-logo {
|
|
padding-top: 20px;
|
|
padding-bottom: 10px;
|
|
max-width: 200px
|
|
}
|
|
|
|
// accessibility skip link
|
|
a.skip-main {
|
|
left:-999px;
|
|
position:absolute;
|
|
top:auto;
|
|
width:1px;
|
|
height:1px;
|
|
overflow:hidden;
|
|
z-index:-999;
|
|
}
|
|
a.skip-main:focus, a.skip-main:active {
|
|
color: #fff;
|
|
background-color:#000;
|
|
left: auto;
|
|
top: auto;
|
|
width: 30%;
|
|
height: auto;
|
|
overflow:auto;
|
|
margin: 10px 35%;
|
|
padding:5px;
|
|
border-radius: 15px;
|
|
border:4px solid yellow;
|
|
text-align:center;
|
|
font-size:1.2em;
|
|
z-index:999;
|
|
}
|
|
|
|
h2 {
|
|
font-size: 22px;
|
|
}
|
|
|
|
h3 {
|
|
font-size: 20px;
|
|
}
|
|
|
|
h4 {
|
|
font-size: 16px;
|
|
}
|
|
|
|
|
|
.row-striped {
|
|
vertical-align: top;
|
|
line-height: 2.6;
|
|
padding: 0px;
|
|
margin-left: 20px;
|
|
box-sizing: border-box;
|
|
//border-left: 1px solid #dddddd;
|
|
//border-right: 1px solid #dddddd;
|
|
display: table;
|
|
|
|
}
|
|
|
|
.row-striped .row:nth-of-type(odd) div {
|
|
background-color: #f9f9f9;
|
|
border-top: 1px solid #dddddd;
|
|
display: table-cell;
|
|
|
|
}
|
|
|
|
.row-striped .row:nth-of-type(even) div {
|
|
background: #FFFFFF;
|
|
border-top: 1px solid #dddddd;
|
|
display: table-cell;
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
COLUMN SELECTOR ICONS
|
|
-----------------------------
|
|
This is kind of weird, but it is necessary to prevent the column-selector code from barfing, since
|
|
any HTML used in the UserPresenter "title" attribute breaks the column selector HTML.
|
|
|
|
Instead, we use CSS to add the icon into the table header, which leaves the column selector
|
|
"title" text as-is.
|
|
|
|
See https://github.com/snipe/snipe-it/issues/7989
|
|
|
|
*/
|
|
|
|
th.css-barcode > .th-inner,
|
|
th.css-license > .th-inner,
|
|
th.css-consumable > .th-inner,
|
|
th.css-accessory > .th-inner
|
|
{
|
|
font-size: 0px;
|
|
line-height: 4!important;
|
|
text-align: left;
|
|
text-rendering: auto;
|
|
-webkit-font-smoothing: antialiased;
|
|
-moz-osx-font-smoothing: grayscale;
|
|
}
|
|
|
|
|
|
th.css-padlock > .th-inner::before,
|
|
th.css-barcode > .th-inner::before,
|
|
th.css-license > .th-inner::before,
|
|
th.css-consumable > .th-inner::before,
|
|
th.css-accessory > .th-inner::before
|
|
|
|
{
|
|
display: inline-block;
|
|
font: normal normal normal 14px/1 FontAwesome;
|
|
font-size: 20px;
|
|
}
|
|
|
|
th.css-padlock > .th-inner::before
|
|
{
|
|
content: "\f023";
|
|
padding-right: 2px;
|
|
}
|
|
|
|
th.css-barcode > .th-inner::before
|
|
{
|
|
content: "\f02a";
|
|
}
|
|
|
|
th.css-license > .th-inner::before
|
|
{
|
|
content: "\f0c7";
|
|
}
|
|
|
|
th.css-consumable > .th-inner::before
|
|
{
|
|
content: "\f043";
|
|
}
|
|
|
|
th.css-accessory > .th-inner::before
|
|
{
|
|
content: "\f11c";
|
|
}
|
|
.small-box .inner {
|
|
padding-left: 15px;
|
|
padding-right: 15px;
|
|
padding-top: 15px;
|
|
color: #fff;
|
|
}
|
|
|
|
|
|
.small-box > a:link, .small-box > a:visited, .small-box > a:hover {
|
|
color: #fff;
|
|
}
|
|
|
|
.select2-container--default .select2-selection--single, .select2-selection .select2-selection--single {
|
|
border: 1px solid #d2d6de;
|
|
border-radius: 0;
|
|
padding: 6px 12px;
|
|
height: 34px;
|
|
}
|