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

3377 commits

Author SHA1 Message Date
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
snipe 9eac3c2e64 Updated Italian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:37:42 -07:00
snipe 4c220df181 Updated Icelandic 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:36:58 -07:00
snipe 0703d037d6 Updated Indonesian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:35:48 -07:00
snipe 28498857c2 Updated Hungarian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:35:12 -07:00
snipe 7c4e73d660 Updated Croatian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:34:31 -07:00
snipe c42c9cc832 Updated Hebrew 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:33:41 -07:00
snipe 7cebbf48ee Updated Irish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:32:55 -07:00
snipe 70745952b9 Updated French 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:32:12 -07:00
snipe 807509030c Updated Filipino 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:27:32 -07:00
snipe 0a673f4ffe Updated Finnish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:27:01 -07:00
snipe f1caf69f05 Updated Persian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:26:15 -07:00
snipe 86532746b1 Updated Estonian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:25:35 -07:00
snipe 94035e5e4b Updated Spanish, Venezuela 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:24:19 -07:00
snipe 5a84a1d15c Updated Spanish, Mexico 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:23:41 -07:00
snipe 48c924e0b2 Updated Spanish, Spain 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:23:16 -07:00
snipe 54deaf18d1 Updated Spanish, Colombia 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:22:57 -07:00
snipe 4f3617d271 Updated Indonesian English 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:21:43 -07:00
snipe 096be6e095 Updated British English 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:21:33 -07:00
snipe 02601a95e0 Updated Greek 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:20:09 -07:00
snipe 70653419cd Updated German Informal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:19:24 -07:00
snipe 8f258d8454 Updated German 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:18:50 -07:00
snipe 9f26a30256 Updated Danish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:18:16 -07:00
snipe 0b392286ce Updated Welsh 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:17:33 -07:00
snipe 5f56b30d19 Updated Czech 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:16:42 -07:00
snipe ba7d8f1c07 Updated Catalan 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:15:38 -07:00
snipe e391c1322c Updated Bulgarian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:14:50 -07:00
snipe f634640425 Updated Arabic 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:13:56 -07:00
snipe 4bcc1c6aa9 Updated Amharic 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:12:55 -07:00
snipe 88b98e6cf7 Updated Afrikaans 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:11:43 -07:00
snipe a9bb2f78cc Fixed borked English string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:11:35 -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 383d48fd9c
Merge pull request #12787 from Godmartinz/accessory_unavailable_message 
Added unavailable message to prevent over-checkout of Accessories
 2023-04-06 15:05:18 -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 c1daac153b Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:17:47 -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
snipe 9af2d0a6de
Merge branch 'develop' into features/replace_icheck_with_only_css 2023-04-05 13:04:12 -07:00
Godfrey M b038fe8f2e adds unavailable message to overcheckout 2023-04-05 10:00:39 -07: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 3bd87a2785 Removed iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:52:54 -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 3473e24de5 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:36:23 -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 1ea813a1c5 Updated strings to trans_choice 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 18:54:59 -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 c5d74ac27f Additional form CSS tweaks for disabled and unchecked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:08:47 -07:00
snipe 9146850ffe Added string for emailing user credentials 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:08:31 -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
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 4035cd118e Handle the column selector in bs table styling 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 14:35:47 -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 868615d5e7 Removed iCheck from snipeit.js and webpack 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 12:17:31 -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 986c73982e Check if status is set 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-30 14:50:56 -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 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 0f72554a9f translations for messages 2023-03-30 13:57:18 -05: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
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
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
snipe 32922e6461 Use corrected language string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:39:52 -07:00
snipe 527c812d04 Use icon for group users header 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:39:41 -07:00
Joe Ferguson 47e18db172
Fix next button string for Step 2 preflight 2023-03-28 10:30:56 -05:00
Joe Ferguson d667ae53ed
Add missing strings to Step 2 preflight 2023-03-28 10:30:35 -05:00
snipe 09674c012c Use named route with params 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 07:18:45 -07:00
Joe Ferguson cd49f65c0b
User preflight fix translation strings w/ bad path 2023-03-24 15:27:08 -05:00
snipe 697cb4fe6d Fixed translation string for importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 08:27:53 -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 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
Marcus Moore 9d2c4a4dee
Update webhook message 2023-03-23 10:38:35 -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 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 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 f29e813332 Translated “Clear & Save” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:58:35 -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
akemidx 3134279a95 small edits 2023-03-21 15:48:53 -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 071a642509 Changed phrasing in translatons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:15:28 -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 e47fc9527b Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:50:02 -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