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
10829 commits 101 branches 268 tags 320 MiB
Commit graph

3535 commits

Author SHA1 Message Date
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
snipe 4954b50280 Added new strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:57:46 -07:00
Godfrey M cb68f41d9c added ldap_location to settings 2023-04-25 11:44:04 -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 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
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 4d9d75379f Improved translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:39:16 -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 df7b19bc1e Removed unused validations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:35:06 -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 4d09021e9c Compact tooltip for un-deletable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:19 -07:00
snipe beba31afbf Added tooltip for disabled delete buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:09 -07:00
snipe 3e53870b37 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:00:13 -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 725adebffe Translate log message 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:07:12 -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 25a83c2915 Removed moved translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:01 -07:00
snipe 3f4159f058 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:01:52 -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 3153013715 Fixed semicolon parse error from #12832 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 20:14:45 -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
snipe c70cb36c80
Merge pull request #12828 from Godmartinz/bug/sc-20783 
Fixed dark themes pagination and notification drop menu
 2023-04-17 16:26:36 -07:00
Godfrey M 247f47ce69 adjusts button color 2023-04-17 15:29:53 -07:00
Godfrey M aabd5e92a8 surrounding text aligns correctly 2023-04-17 12:44:06 -07:00
Godfrey M 0cca45d858 footer now uses flex 2023-04-17 11:57:35 -07:00
snipe dd78d2fc66 Added language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:51 -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
snipe 955539807c
Merge pull request #12830 from snipe/features/adds_supplier_id_to_components 
Added supplier to components and consumables
 2023-04-15 18:42:23 -07:00
snipe b73aed2b69 Merge remote-tracking branch 'origin/develop' 2023-04-15 18:30:21 -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
snipe b690ed97d5 Fixed unclosed parens in translation file 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 12:05:06 -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
Godfrey M d476f0de3a forgot dark blue 2023-04-13 10:34:17 -07:00
Godfrey M bbb4032050 fixes rest of dark mode themes 2023-04-13 10:32:42 -07:00
Godfrey M b83daea265 fixes dark orange 2023-04-13 10:27:38 -07:00
Godfrey M 46ff738494 fixes the notification dropdown menu 2023-04-12 16:12:48 -07:00
akemidx 0a993b2aa1 added external link icon to warranty link 2023-04-12 18:52:21 -04:00
Godfrey M cbb25025d5 fixes pagination for rest of skins 2023-04-12 15:41:04 -07:00
Godfrey M f3d12351a6 fixes paginiation for black-dark 2023-04-12 15:23:56 -07:00
Godfrey M 2d27f0155a targeting paginiation 2023-04-12 15:06:06 -07: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 358b0548fa Added string for translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 22:03:26 -07: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 4840046f44 Check for available quantity on consumables before checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 20:38:02 -07:00
snipe 574b0184fc Updated Zulu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:57:35 -07:00
snipe 9db5e328c9 Updated Chinese Traditional 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:57:28 -07:00
snipe 0a77216b6f Updated Chinese Traditional, Hong Kong 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:57:03 -07:00
snipe 44b4274a49 Updated Chinese Simplified 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:56:43 -07:00
snipe 7711540514 Updated Vietnamese 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:55:47 -07:00
snipe 4d7b2b5747 Updated Urdu (Pakistan) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:55:06 -07:00
snipe 6f92144b96 Updated Ukrainian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:54:41 -07:00
snipe 8446f456ab Updated Turkish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:54:06 -07:00
snipe d5b4971371 Updated Tagalog 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:53:35 -07:00
snipe 0686e1e7c4 Updated Thai 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:52:36 -07:00
snipe 6143f28bb9 Updated Tamil 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:52:03 -07:00
snipe 0e2dd5d76c Updated Swedish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:51:37 -07:00
snipe eae5e7b35d Updated Serbian (Latin) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:51:15 -07:00
snipe 4f8dc54872 Updated Slovenian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:50:34 -07:00
snipe 81129ed91f Updated Slovak 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:49:54 -07:00
snipe 48dff4681b Updated Sinhala 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:48:25 -07:00
snipe 40bb5bb4f0 Updated Russian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:47:56 -07:00
snipe 51f1ad6693 Updated Romanian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:46:22 -07:00
snipe ca49923371 Updated Portuguese, European 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:45:54 -07:00
snipe d9d3d11cc6 Updated Portuguese, Brazilan 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:45:42 -07:00
snipe b7537a73b2 Updated Polish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:45:10 -07:00
snipe 98aa8623d3 Updated Norwegian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:44:48 -07:00
snipe aa9420cbad Updated Dutch 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:44:15 -07:00
snipe 9b7ab63277 Updated Malay 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:43:38 -07:00
snipe d588b2905d Updated Mongolian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:43:12 -07:00
snipe c176f3d030 Updated Malayalam 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:42:40 -07:00
snipe 173e2add88 Updated Macedonian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:42:14 -07:00
snipe 359d8d0e08 Updated Maori 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:41:36 -07:00
snipe 2ea03f66a2 Updated Latvian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:40:55 -07:00
snipe d2301dae63 Updated Lithuanian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:40:21 -07:00
snipe e24a9ccf1c Updated Korean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:39:35 -07:00
snipe 227d7e75a3 Updated Japanese 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:38:59 -07:00
snipe 8befc23178 Updated Inuktitut 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:38:17 -07:00