ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,447 Commits 84 Branches 293 Tags
9824f43780e7e842570b83688a514b8a9e47a030
Commit Graph

5423 Commits

Author SHA1 Message Date
Godfrey M 9824f43780 added other target options to accessories and assets 2025-04-09 10:50:42 -07:00
Godfrey M 17b8ea9c86 removed unnecessary code 2025-04-08 11:51:29 -07:00
Godfrey M 85b67dbb71 adds redirect to user option from checkin blades 2025-04-08 10:13:27 -07:00
Godfrey M a602b2fd47 adds option to redirect back to checkedInBy user for assets 2025-04-08 10:09:43 -07:00
snipe 43c15ef134 Merge branch 'develop' into feature/locations_with_companies 2025-04-08 09:18:48 +01:00
snipe fcd0ca3b94 Merge branch 'develop' into min_qty_in_bulk_model_edit 2025-04-08 07:14:15 +01:00
snipe 90329a2b2f Merge pull request #16529 from Godmartinz/location_tab_active-n-scroll_bar_fix 
Fix active table tab and double scroll bar under locations
 2025-04-08 07:12:33 +01:00
snipe 2275186222 Merge pull request #16652 from akemidx/feature/sc-28820 
Username dropdown to show Usernames and not Emails as Examples
 2025-04-08 06:32:19 +01:00
snipe 5a1c81954f Merge pull request #16651 from Godmartinz/qr_code_location_option 
Fixes #9660 - Adds location qr code option to labels
 2025-04-08 05:53:48 +01:00
snipe 05e66c33ee Added audits string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 05:09:08 +01:00
snipe 744e844291 Added audit tab 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 05:08:58 +01:00
snipe c46a9a773d Fixed admin string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 05:08:08 +01:00
snipe 849da2fb63 Use correct audit icon 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 04:15:59 +01:00
snipe d2c7385197 Updated class for error text 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 04:06:54 +01:00
snipe 74f8cb5298 Updated url in bootstrap partial 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 02:02:28 +01:00
snipe 62e863a0fa Removed tooltip code 
This throws an error currently

Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 02:02:10 +01:00
akemidx 443a5c2348 chaning username dropdown to be usernames and not emails 2025-04-07 19:25:32 -04:00
snipe ce460c9ab0 Updated route 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-07 22:15:09 +01:00
snipe 241777c1fd Added translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-07 22:10:12 +01:00
snipe acdbf452e2 Added checkbox to custom field form 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-07 22:10:01 +01:00
snipe b8a9db2faf Added display_audit to custom fields list 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-07 22:09:51 +01:00
snipe dfdc24936d Added custom fields partial 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-07 22:09:29 +01:00
Godfrey M bc3b3cf86e add psuedo example location_id for preview 2025-04-07 12:53:17 -07:00
Godfrey M a69133e2ae adds location qr code option to labels 2025-04-07 12:36:05 -07:00
snipe b66618ff3f Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-07 13:54:10 +01:00
snipe b5ef856d9e Translate request cancel string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-05 17:24:06 +01:00
snipe d203c4e49c Text tweaks and nicer buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-05 15:58:03 +01:00
snipe f2c730bd57 Fix wrapping on #16628 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-05 14:10:23 +01:00
snipe b1e2b5ab4a Merge pull request #16623 from Godmartinz/accessories_history_view_fix 
Fixes Accessories history table color contrast
 2025-04-03 15:37:55 +01:00
snipe 7c1438c370 Merge pull request #16446 from marcusmoore/feature/improve-checkout-asset-mail-wording 
Improved wording in asset checkout emails
 2025-04-03 15:37:30 +01:00
snipe 274c5fe4d3 Added max-width 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 15:07:10 +01:00
snipe b7c011dd2d Use new one line code style 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 15:03:31 +01:00
snipe a4a99adf80 Added one-line code style 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 15:03:16 +01:00
snipe c7890f4c3b Use id as copy key 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 13:52:55 +01:00
snipe 6d7f061a1d Larger key box 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 13:39:31 +01:00
snipe 45d3c0444b Added copy to license keys 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 12:29:30 +01:00
snipe 9204309d67 Checkin/Checkout note added to language file 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 12:28:47 +01:00
snipe a2035693e6 Added licenseKeyFormatter 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 12:28:30 +01:00
snipe d898288397 Remove email user for comonent import type 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 21:08:54 +01:00
Marcus Moore af88ce5801 Merge branch 'develop' into feature/improve-checkout-asset-mail-wording 2025-04-02 12:01:53 -07:00
Godfrey M b1b248f03d removed duplicate class from accessories history table 2025-04-02 11:29:01 -07:00
snipe df1c7c4f95 Merge pull request #16609 from snipe/login_throttle_update 
Updated login attempts and throttle duration
 2025-04-02 18:28:34 +01:00
snipe 2197b46658 Link to admin user 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 14:03:09 +01:00
snipe 31e337255a Use adminuser instead of created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 13:26:12 +01:00
snipe f12d173581 Fixed #16618 - added notes to location sidebar 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 13:23:33 +01:00
snipe cb59c23f0b Added pdf logo to the blade 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:13:34 +01:00
snipe 56ae9d0ba9 Nicer upload logo labels 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:10:27 +01:00
snipe a59d69cb0d Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:10:05 +01:00
snipe c305284930 Merge pull request #15922 from spencerrlongg/feature/sc-24347 
Requestable/Request Item API Endpoints
 2025-04-01 18:15:42 +01:00
snipe 5d265f5bfd Change to minutes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-01 15:01:34 +01:00