DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
11519 commits 101 branches 268 tags 320 MiB
Commit graph

3006 commits

Author SHA1 Message Date
akemidx 526c089424 Buttons on the accessory view page 2023-05-03 16:40:06 -04:00
akemidx 67105528d1 Buttons on the accessory view page 2023-05-03 16:31:56 -04:00
akemidx 12f0c42545 buttons added 2023-05-03 16:31:56 -04:00
slong753 815c77f943 wip 2023-05-03 14:49:31 -05:00
snipe fe710efb40
Merge pull request #12874 from Godmartinz/feature/sc-23130 
Adds a checkout range for custom asset reports
 2023-05-03 11:43:44 -07:00
snipe b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset 
Added ability to auto-add fields to new fieldsets
 2023-05-03 11:04:33 -07:00
snipe 4a643c1252
Merge pull request #12880 from Godmartinz/asset_total_cost 
Added component costs to asset view
 2023-05-03 10:49:03 -07:00
snipe 466c2fd47c
Merge pull request #12966 from Godmartinz/bug/sc-23161 
fixed color differences in dark themes
 2023-05-03 10:38:54 -07:00
Godfrey M 7711938f4b fixes dark yellow 2023-05-01 16:27:21 -07:00
akemidx ad7a1d6c3b edits from Github comments 2023-05-01 15:50:48 -04:00
snipe 609b1646e9 Merge remote-tracking branch 'origin/develop' 2023-04-30 18:40:52 -07:00
snipe 031c9c1204 Added nobr tag to prevent external link icon and link from breaking 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-30 18:40:40 -07:00
snipe 77b51136cf Merge remote-tracking branch 'origin/develop' 2023-04-30 18:38:19 -07:00
snipe 0222a922a1 Added tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-30 18:20:23 -07:00
snipe 8ad600085a Moved external link icon into link 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-30 18:17:56 -07:00
akemidx cd389368f7 adding in script 2023-04-27 19:00:17 -04:00
akemidx d3675831bb snippet rewrite 2023-04-27 18:58:59 -04:00
akemidx 84134b45e6 form work 2023-04-27 18:58:59 -04:00
akemidx b1e68be545 delete button progress 2023-04-27 18:58:59 -04:00
akemidx d94bed3f57 push for testing 2023-04-27 18:58:59 -04:00
akemidx aabcf22b40 commiting 2023-04-27 18:58:59 -04:00
akemidx af549a0be9 Mock Up of the Buttons 2023-04-27 18:58:59 -04:00
snipe 1384ca658a Merge remote-tracking branch 'origin/develop' 2023-04-26 18:42:58 -07:00
snipe e25dc42121 Switch to externalLinkFormatter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:42:34 -07:00
snipe 99ef435d40 Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:32:38 -07:00
snipe e853f8b7fd Removed SR text for exporting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:23:21 -07:00
snipe deff312381 Remove auto-link from from manufacturer warranty 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:16:23 -07:00
snipe 7bffe30fae Merge remote-tracking branch 'origin/develop' 2023-04-26 17:55:48 -07:00
snipe 7974c172fd Switch back to “normal” url for support 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:48:38 -07:00
snipe 54a766c4f9 Added dynamic warranty URL to manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:39:15 -07:00
snipe 27de5c62c5 Merge remote-tracking branch 'origin/develop' 2023-04-26 15:15:43 -07:00
snipe 7c0ef581c5 Added help text to the now-dynamic manufacturer URLS 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 15:12:36 -07:00
snipe 0c5837e4a0
Merge pull request #12929 from snipe/fixes/use_asset_tag_if_no_asset_name_given 
Use the asset tag instead of asset name if no name is given
 2023-04-26 14:49:38 -07:00
snipe 5eac314f4d
Merge pull request #12906 from akemidx/feature/sc-20622 
Dynamic warranty link for manufacturers' support urls
 2023-04-26 14:49:22 -07:00
snipe b5b335a2ca Use the asset tag instead of asset name if no name is given 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 14:41:19 -07:00
snipe d6ea5de5b8 Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset 2023-04-25 22:20:50 -07:00
snipe 42f0975414 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2023-04-25 22:19:27 -07:00
snipe 31a3be4c6a Small refactor of HTML, added top submit button 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:51:59 -07:00
snipe 67212f9d57 Changed layout, added fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:59:29 -07:00
snipe 4e3ccb74bc Fixed slightly weird padding 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:59:19 -07:00
Godfrey M cb68f41d9c added ldap_location to settings 2023-04-25 11:44:04 -07:00
Godfrey M c9eb1410d7 swaps version and open source text in the footer 2023-04-25 11:03:05 -07:00
Godfrey M b8c424fca0 adds users total cost to user profile 2023-04-24 09:17:42 -07:00
snipe 0c425ed0e7 Merge remote-tracking branch 'origin/develop' 2023-04-21 05:19:19 -07:00
akemidx 16a5a883e5 new request, preparing support_url for validation 2023-04-20 16:34:25 -04:00
Godfrey M 97df39001d adds optional breakdowns for total cost 2023-04-19 17:51:37 -07:00
Godfrey M 6872f8da7b adding total cost to user view 2023-04-19 17:31:09 -07:00
Godfrey M bd212b3108 adds component costs to asset view 2023-04-19 16:35:06 -07:00
Godfrey M 0e1f50c226 adds checkout-range to jquery 2023-04-19 10:11:26 -07:00
Godfrey M d2118ba230 removed space from un deployable total in sidebar 2023-04-19 09:46:15 -07:00
Godfrey M 8a5612d1c9 fixes comment 2023-04-19 09:13:43 -07:00
Godfrey M bdd1045272 adds a checkout range for custom asset reports 2023-04-19 09:11:44 -07:00
Godfrey M 0ab400f5bc removed deadspace and pull 2023-04-18 15:23:11 -07:00
Godfrey M f15b0d8591 fix for footer 2023-04-18 15:20:38 -07:00
snipe c68563ae08 Merge remote-tracking branch 'origin/develop' 2023-04-18 13:01:37 -07:00
snipe d3bdaf7cd3 Fixed destination name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 12:59:46 -07:00
snipe 92f516484e Small tooltip improvements for undeployable items 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 12:54:06 -07:00
snipe b626e5a3bf Merge remote-tracking branch 'origin/develop' 2023-04-18 12:33:32 -07:00
snipe bfda46276a
Merge pull request #12849 from snipe/features/adds_license_checkin_checkout_to_all_in_gui 
Added license checkin/checkout to all in license GUI
 2023-04-18 12:32:30 -07:00
snipe 031586495a Small cosmetic tweaks to 2FA reset class, fixed weird layout on 2FA reset button 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 12:09:41 -07:00
snipe d871a14687 Added fa-fw for nicer display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:49:40 -07:00
snipe 00a9591c4c Added autoassign_licenses in view, added fa-fw 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:49:29 -07:00
snipe 41358eba85 Updated label 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:29:28 -07:00
snipe 59f4fe67d6 Removed duplicate tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:28:35 -07:00
snipe 2c5c4ab974 Nicer layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:40:06 -07:00
snipe 95767c46ac Fixed delete modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:37:13 -07:00
snipe 0eadc00f4d Removed unneeded css class 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:37:04 -07:00
snipe 7aab4290c7 Updated tooltips with data-tooltip=true from old method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:50 -07:00
snipe 8a41f37054 Persists buttons through tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:00:06 -07:00
snipe ec0413254e Removed action menu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:09:40 -07:00
snipe 220e20d208 Changed tooltip invocation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:36 -07:00
snipe d3b087b5da Clearer padding between buttons, added tooltips 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:19 -07:00
snipe 0dd967cf2b Merge remote-tracking branch 'origin/develop' 2023-04-17 21:05:09 -07:00
snipe 912f6c45ee Reverted #12832 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 21:04:47 -07:00
snipe 9a73f5eca3 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2023-04-17 20:27:49 -07:00
snipe c12ac9912c
Merge pull request #12832 from Godmartinz/fix_footer_space 
Fixed footer space when customized
 2023-04-17 20:11:15 -07:00
Godfrey M aabd5e92a8 surrounding text aligns correctly 2023-04-17 12:44:06 -07:00
slong753 52dc99588e pushing for now, needs validation work 2023-04-17 13:57:48 -05:00
Godfrey M 0cca45d858 footer now uses flex 2023-04-17 11:57:35 -07:00
snipe add9e561f9 Added buttons on license page, greyed out where appriate 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:42 -07:00
snipe ff9af7ea74 Added genetic modal partial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:15 -07:00
snipe bc7c0aa80d Fixed clone tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:00 -07:00
snipe 73188df090 Added autoassign_licenses to bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:22:37 -07:00
snipe cf7f244942 Added (clarified?) edit autoassign_licenses in user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:19:37 -07:00
snipe 06d46a4523 Indenting change for clarity 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:17:55 -07:00
snipe 8e5042418a Added buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:30:32 -07:00
snipe 0210ecde88 Include confirm modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:29:55 -07:00
snipe b2940f9915 Added confirm modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:29:48 -07:00
snipe 21e78bee71 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	package-lock.json
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2023-04-15 21:05:18 -07:00
snipe 589f7fa183 Larger qty box 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 21:03:09 -07:00
snipe 9ff62c966e Check for $item (matters mostly in custom report blade) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 21:03:00 -07:00
snipe 32030c4f71 Merge remote-tracking branch 'origin/develop' 2023-04-15 18:44:25 -07:00
Godfrey M 42f198ffed fixes footer space when customized 2023-04-13 12:24:59 -07:00
Godfrey M b16c062485 fixes partial 2023-04-13 12:05:59 -07:00
Godfrey M ab67d903b5 adds multi select to custom report for companies 2023-04-13 12:02:11 -07:00
snipe 607ab3988a Added supplier to edit/creatre blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:06:07 -07:00
snipe b6d3f2827b Switched to standardized require check 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:05:52 -07:00
snipe 65bb0486d4 Changed blade to use standard required check 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:04:29 -07:00
snipe a40bad0972 Added consumables and components columns to supplier list 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:04:13 -07:00
snipe 6eed89df91 Added components and consumables tab to suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:03:26 -07:00
akemidx 0a993b2aa1 added external link icon to warranty link 2023-04-12 18:52:21 -04:00
slong753 8b9aea8874 very much WIP, but dupe queries reduced 
but i think this can be cleaned up a bit more
 2023-04-12 14:46:48 -05:00
snipe 9a37273750 Merge remote-tracking branch 'origin/develop' 2023-04-12 08:28:50 -07:00
snipe 74babfa081 Added maxlength="10" 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 08:26:36 -07:00
snipe aac76d40fe Merge remote-tracking branch 'origin/develop' 2023-04-12 06:37:01 -07:00
snipe 0f3702b0fc Fixed incorrect translation string for bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 06:35:28 -07:00
snipe 0e93a9229d Merge remote-tracking branch 'origin/develop' 2023-04-12 06:32:06 -07:00
snipe 89b031d64d Removed iCheck code from merge users script 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 06:30:52 -07:00
snipe 28e0891645 Merge remote-tracking branch 'origin/develop' 2023-04-11 23:36:59 -07:00
snipe afd01869a5 Check for Carbon exception 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-11 23:35:41 -07:00
akemidx 2453913080 dynamic link w/ dynamic image 2023-04-11 14:53:44 -04:00
akemidx 71ff987e3c dynamic link w/ dynamic image 2023-04-11 14:32:11 -04:00
akemidx 968701b971 starting to implant the str lower solution 2023-04-10 17:28:19 -04:00
snipe 22336da362 Merge remote-tracking branch 'origin/develop' 2023-04-09 14:08:03 -07:00
snipe 70ce0d9ee6 Maintain activated state on editing a user 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-09 14:06:29 -07:00
snipe b3fab6d47d Merge remote-tracking branch 'origin/develop' 2023-04-07 10:47:48 -07:00
snipe 19d5d34ffb Echo out the array values in withInput() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-07 10:16:35 -07:00
snipe b09b562f3a Merge remote-tracking branch 'origin/develop' 2023-04-07 09:46:02 -07:00
snipe 42eef7eb3f
Merge pull request #12803 from snipe/fixes/small_component_fixes 
Small component UI/validation/API fixes
 2023-04-07 09:45:36 -07:00
snipe 42a60a9ccb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-04-07 08:22:24 -07:00
Jens Maes c42078ea4a Update bpay.blade.php 
Removed FARTS from the file. This was shown in production on the master branch.
 2023-04-07 10:15:34 +02:00
snipe 43ad0f58b5 SLightly cleaner layout - still needs work 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 22:03:15 -07:00
snipe a8ca3ad2a9 Merge remote-tracking branch 'origin/develop' 2023-04-06 18:49:51 -07:00
snipe 74b471bbad Check for more specifics in env vars 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 16:24:46 -07:00
snipe 6ff3745adf Added BM JS 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 16:19:33 -07:00
snipe c683233aa3 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2023-04-06 15:00:38 -07:00
snipe bd4757ad7a
Merge pull request #12779 from snipe/features/replace_icheck_with_only_css 
Move from iCheck to pure CSS for radio and checkboxes
 2023-04-06 14:58:33 -07:00
snipe 3d29748f7d Merge remote-tracking branch 'origin/develop' 2023-04-06 13:11:45 -07:00
snipe 2a9f816bfe Prevent wrapping on buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:04:56 -07:00
snipe 506021dbe3 Remove iCheck calls, fixed some bootstrap HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:03:41 -07:00
snipe f90a6fed91 Downgraded error logging to debug 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:02:15 -07:00
snipe 161999fbca Fixed #12772 - use the APP_URL config more consistently 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-05 16:05:40 -07:00
snipe 5e6a6a81d5 Fixed #12776 - larger EOL text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-05 16:00:02 -07:00
snipe 4b4d4e98b6 Use enclosing span for HTML text in grid 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-05 14:10:57 -07:00
slong753 830e3e5594 cleanup 2023-04-05 15:27:28 -05:00
slong753 d56a4e7173 cleanup+formatting 2023-04-05 15:16:46 -05:00
snipe 9af2d0a6de
Merge branch 'develop' into features/replace_icheck_with_only_css 2023-04-05 13:04:12 -07:00
slong753 3929526a57 ok, this works but needs to be tested more 2023-04-04 18:57:51 -05:00
snipe 55857c910a Color picker UI fix 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-04 00:33:05 -07:00
snipe 5919f3843d Small fixes to the color picker (sorry) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-04 00:27:05 -07:00
snipe 6164e8b3fa Changed colors for disabled, removed dupe checkmark 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 23:53:57 -07:00
snipe 0e68b8e9f2 Small fixes for profile edits 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 23:06:09 -07:00
snipe 5df34d0058 Diable SAML submit if in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:40:25 -07:00
snipe 9a3e727390 Updated other form fields to use new label class, fixed HTML for accessibility 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:38:56 -07:00
snipe aca64dc088 Updated check groups for permissions to skip iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:38:24 -07:00
snipe 1af7cdb715 Wrapped the image delete into the existing image upload partial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:35:55 -07:00
snipe 2c47b63e91 Small tweaks to overrides 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:37:07 -07:00
snipe a7787a6cdc Fixed string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:20:58 -07:00
snipe 62c99d4e2e Added check all to user delete 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:19:28 -07:00
snipe 858f1c2d12 Updated audit with icheck, removed popover text - need a better solution with layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:19:12 -07:00
snipe 76b9608de3 Typo fix 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:18:40 -07:00
snipe a861672146 Standardized model bulk blades a little more 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 18:54:46 -07:00
snipe 146976975c Removed <wire:ignore> in model edit for default custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:38:34 -07:00
snipe 58b3369234 Requestable partial - removing icheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:38:12 -07:00
snipe 21448f6adf Model edit - removing icheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:38:02 -07:00
snipe 899b936152 Models bulk edit - removing icheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:37:49 -07:00
snipe 866ba36090 Hardware editing un-icheckification 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:37:34 -07:00
snipe 60d60be0ac Small style specification for notes partial field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:37:16 -07:00
snipe 5ed9385685 Clearer tab name for user info 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:09:25 -07:00
snipe 2c5ddca695 More jquery and form fixes for users 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:08:21 -07:00
slong753 29e3d202fe checking something, quick push 2023-04-03 17:54:31 -05:00
snipe 790f9c2fc4 Updated 2FA to non-icheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 15:38:52 -07:00
snipe b4df9eb586 More checkbox tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 15:33:21 -07:00
snipe 0d050e4016 Updated user edit page with with non-icheck toggles 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 14:55:12 -07:00
snipe 5c89439ba3 Updated login page to use non-icheck 
TODO: override that style for the labels
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 12:18:18 -07:00
snipe 85c0ddf475 Tweaked the col-md to use offset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 12:17:49 -07:00
snipe 5078b51d4d Removed temp disabled attributes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 11:39:02 -07:00
snipe e066f033c8 First attempt at moving us away from iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 10:54:01 -07:00
snipe fcda478712 Merge remote-tracking branch 'origin/develop' 2023-03-30 14:51:23 -07:00
snipe 986c73982e Check if status is set 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-30 14:50:56 -07:00
snipe 080a4c823b Merge remote-tracking branch 'origin/develop' 2023-03-30 14:49:19 -07:00
snipe 1fc0a0f94d Quick fix for bulk restore menu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-30 14:44:38 -07:00
snipe 048be49c14 Merge remote-tracking branch 'origin/develop' 2023-03-30 14:37:47 -07:00
snipe dfa9c07217
Merge pull request #12760 from akemidx/apple_warranty_link_fix2 
Updating Apple warranty link to match current Apple webpage
 2023-03-30 12:47:09 -07:00
akemidx 0c38257f80 fixing one liner 2023-03-30 15:40:23 -04:00
snipe 9ca5285781
Merge pull request #12762 from spencerrlongg/feature/sc-20304 
Bulk Restore from Deleted
 2023-03-30 12:37:50 -07:00
slong753 b84eaaf61a translations done 2023-03-30 13:48:05 -05:00
snipe b7c09042b0
Merge pull request #12758 from inietov/fixes/call_to_member_function_present_null 
Fixed Call to a member function present() on null [sc-20594]
 2023-03-30 11:01:38 -07:00
snipe 10c1e923dc
Merge pull request #12764 from marcusmoore/fixes/importer-fix 
Fixes potential unwanted overwrites in asset imports
 2023-03-30 09:40:58 -07:00
slong753 d5d50264c3 fix permissions stuff + optional parameter 2023-03-29 19:53:04 -05:00
Ivan Nieto Vivanco d622dbb943 Revert the php codeblock and replace it with a ternary 2023-03-29 18:37:47 -06:00
snipe da940a6bcc Merge remote-tracking branch 'origin/develop' 2023-03-29 17:19:50 -07:00
Marcus Moore 6beb3b551a
Fix typo 2023-03-29 17:01:24 -07:00
slong753 d033733fc0 oops, remove a couple things 2023-03-29 18:30:39 -05:00
slong753 e4c76f454c this is good, just needs translations done in view 2023-03-29 18:24:56 -05:00
slong753 162b70d5a9 wireframed, needs a view and should work 2023-03-29 17:34:36 -05:00
Marcus Moore 863a346d6e
Translate strings 2023-03-29 13:37:14 -07:00
Marcus Moore e05546d1fa
Display helpful messages when importing assets 2023-03-29 13:23:45 -07:00
slong753 b0fa298d8f delete a couple things 2023-03-29 15:14:48 -05:00
slong753 65bbecd145 this all works - could use some eyes 2023-03-29 14:46:31 -05:00
akemidx 6bee4c1a75 Updating Apple warranty link to match current Apple webpage 2023-03-29 15:09:14 -04:00
Marcus Moore 9cc74caa9e
Add wire:model to import form checkboxes 2023-03-29 10:58:25 -07:00
Ivan Nieto Vivanco d7c531e1c7 Checks if user variable exist before using its properties 2023-03-29 10:33:15 -06:00
slong753 032ae4348e custom fields display, need to get saving 
+some clean up
 2023-03-28 21:45:31 -05:00
slong753 804a788a27 initial fetch working 2023-03-28 20:31:24 -05:00
snipe 527c812d04 Use icon for group users header 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:39:41 -07:00
snipe 99a05c6401 Merge remote-tracking branch 'origin/develop' 2023-03-28 13:43:24 -07:00
Joe Ferguson 47e18db172
Fix next button string for Step 2 preflight 2023-03-28 10:30:56 -05:00
snipe 03aadc4abf Merge remote-tracking branch 'origin/develop' 2023-03-28 07:20:22 -07:00
snipe 09674c012c Use named route with params 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 07:18:45 -07:00
snipe d2daaf30eb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-03-28 03:32:04 -07:00
Joe Ferguson cd49f65c0b
User preflight fix translation strings w/ bad path 2023-03-24 15:27:08 -05:00
snipe dcbd216e2c Merge remote-tracking branch 'origin/develop' 2023-03-24 08:29:22 -07:00
snipe 697cb4fe6d Fixed translation string for importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 08:27:53 -07:00
snipe 8a395d63a1 Merge remote-tracking branch 'origin/develop' 2023-03-24 07:23:06 -07:00
snipe 16dcc2d3ed Fixed #12641 - add JSON to mimes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 06:57:43 -07:00
snipe 43c286c61f Merge remote-tracking branch 'origin/develop' 2023-03-24 06:18:10 -07:00
snipe 13ad69ee75
Merge pull request #12713 from inietov/fixes/trying_access_array_offset_null 
Fixed Trying to access array offset on value of type null [sc-20528]
 2023-03-24 04:52:56 -07:00
snipe b91e914a61 Merge remote-tracking branch 'origin/develop' 2023-03-23 10:55:58 -07:00
Marcus Moore fe6295a5e4
Update slack_* properties to webhook_* 2023-03-22 14:43:00 -07:00
Ivan Nieto Vivanco aa8dfcf89f Added a ternary to avoid null offset in array 2023-03-22 13:48:23 -06:00
snipe e8e1ada776
Merge pull request #12669 from akemidx/feature/sc-20178 
#20178: Added Dell and Lenovo to warranty link function
 2023-03-22 00:54:40 -07:00
snipe 58ea1592bb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/livewire/slack-settings-form.blade.php
 2023-03-22 00:26:15 -07:00
snipe 545d023a18 Handled a few more hard-coded strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:56:07 -07:00
snipe 473211397f
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent 
Livewire importer without subcomponent
 2023-03-21 23:07:04 -07:00
snipe e08327be95 Ability to remove user location from users 
Rework of #9677 - sorry @godmartinez - I suck :(

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:03:57 -07:00
Brady Wetherington 6fe520a55d Hooked various the contents of the components together 2023-03-21 22:26:32 -07:00
snipe 0418d390f0 Corrected width to 100% 
I should not be allowed to touch computers

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:25:15 -07:00
snipe b3d5bb75a3 Apply master patch to develop because I am an idiot on the wrong branch 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:23:09 -07:00
snipe 5346ebba94 Make select2 list in slack settings not searchable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:21:21 -07:00
snipe 1fa9f80c03 Correctly disable the select2 in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:18:42 -07:00
snipe e40762cf7f Small anal-retentive spacing/indenting tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 21:00:43 -07:00
snipe 2d3ddd1c7a Fixed default value for webhook_selected 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 20:56:08 -07:00
snipe 637438ccf6 Added select2 to slack settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 20:00:11 -07:00
snipe 647f47cdfe Check for demo mode in the clear method for the controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 19:27:05 -07:00
snipe a14d1b981d Switched singleton to static helper method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 19:22:18 -07:00
snipe d883084830 Fixed some funky HTML tags 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:58:26 -07:00
snipe 658252125e Added new partial for the form inline “demo mode” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:57:27 -07:00
snipe 35bef6625a
Merge pull request #12703 from Godmartinz/webhook_clean_up 
adds clear and save button, save button updates accordingly
 2023-03-21 17:02:33 -07:00
Godfrey M 2754277068 adds csrf token and missing divs 2023-03-21 16:12:46 -07:00
snipe c229d69cec Added next audit date override in bulk asset edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 16:01:41 -07:00
Godfrey M 3c28242a2e save button updates accordingly 2023-03-21 15:53:09 -07:00
snipe ecb11c3a12 Fixed #12682 - add default location to maintenance report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 13:52:21 -07:00
snipe 4f8542b71b
Merge pull request #12680 from akemidx/clone_accessories 
Clone accessories
 2023-03-21 13:37:04 -07:00
akemidx bb7b655fd2 translating screen reader lines 2023-03-21 16:02:34 -04:00
Brady Wetherington 704a2ad858 WIP: trying to merge two LW components into one, not working yet 2023-03-18 20:31:56 -07:00
snipe e39a75f2cc Fixed min width on select2 bulk menus 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:14:57 -07:00
snipe ea4a37d8ef Fixed cancel button alignment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:14:09 -07:00
snipe 820ae09a6f Reworked the layout of the confirm merge form a little 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:42:41 -07:00
snipe 28cc8f9d69 Nicer user history display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:41:43 -07:00
snipe c752e3bb86 Fixed divs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:48:41 -07:00
snipe e557f03cc2 Disable submit if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:43:33 -07:00
snipe c93096b767 Made the table wider, used icons to compact space 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 23:13:05 -07:00
snipe 736777e1e6 Added email and username to merge user confirmation screen 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 22:48:20 -07:00
snipe 07fbbf5f7f Added merge to user menu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:54 -07:00
snipe 0dfb51f642 User merge blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:32 -07:00
akemidx a8e2f72e25 accessory cloning, WITHOUT copying over the image. 2023-03-15 16:55:24 -04:00
akemidx 68094b23b9 moved dell and levono icons to local machine 2023-03-15 15:02:33 -04:00
snipe fdacd5d5b5
Merge pull request #12636 from akemidx/feature/sc-20330/date-on-all-assigned-pdf 
Datestamp on "Print All Assigned" generated form
 2023-03-15 11:31:52 -07:00
akemidx f38f6f57ae fixed localization and formatting. simplified code to remove php snippet 2023-03-15 14:00:29 -04:00