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

4155 commits

Author SHA1 Message Date
Godfrey M a110b5fcca ugh 2024-01-04 12:37:53 -08:00
Godfrey M 1f1e58eb1e remove unintentional change 2024-01-04 12:36:57 -08:00
Godfrey M 32b34ca9b9 departmentNameLinkFormatter had a bad url 2024-01-04 12:33:33 -08:00
snipe 50eb257cec Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:12:29 +00:00
spencerrlongg 41e0275c95 htmlentities() 2024-01-03 12:42:36 -06:00
snipe 8bc5f08da5 Fixed a few more small localization issues 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 20:14:49 +00:00
snipe eead7b49e3 Fixed language code 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:07:11 +00:00
snipe 493ffc10c1 Defaulted to en-US on quickstart 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:16:00 +00:00
snipe 98e6f7e14c Updated form marco with new locale codes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 18:12:02 +00:00
snipe 02f24d3332 WTF 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:57:17 +00:00
Godfrey M 4b071745fa prevents tables and table data from overflowing 2023-12-19 09:49:40 -08:00
snipe 6801caaa0d Added backl vendors directory 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:49:10 +00:00
snipe b9a877d92d Fixed donked dir tree 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:42:39 +00:00
Godfrey M c0dba95426 testing ldap test table fix 2023-12-19 09:32:26 -08:00
snipe 026ea41dee Use correct language codes, updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:23:16 +00:00
snipe 1063dcfb7b
Merge pull request #13994 from Godmartinz/add_license_to_info_for_activation 
Added licensed to name and email in user profile license view
 2023-12-19 13:16:34 +00:00
snipe e1d2fdcfb7
Merge pull request #14001 from Godmartinz/feature/sc-18577 
Added Status Label names to Asset history/ Action log
 2023-12-18 22:41:02 +00:00
snipe e71080ef37 Make action date sortable on asset history view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:41:15 +00:00
snipe 14c70ee6c4 Removed BS th classes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:37:47 +00:00
snipe 8fc470c978 Added fields to activity report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:34:44 +00:00
snipe f5f136b9b5 Added fields to history views 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:34:31 +00:00
snipe 93c7108eda Added action source to translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:33:49 +00:00
snipe 70250191ed
Merge pull request #14026 from snipe/bug/sc-23599 
Fixed checkbox/radio button display on models edit for default fields
 2023-12-13 14:00:27 +00:00
snipe 337d863330 Missed closing label on radio buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 13:52:31 +00:00
snipe ac96bad4a1
Merge pull request #14014 from Godmartinz/requested_assets_table_missing_header 
added a missing table header on requested table for checkout
 2023-12-13 12:57:20 +00:00
snipe 3834221589 Fixed radio button display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 06:30:08 +00:00
snipe 016ca1adc1 Fixed HTML for checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 06:27:50 +00:00
snipe 631dd58de1 Added model name and number to quickscan 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 04:23:04 +00:00
snipe 41f1c5c1e3 Smaller icon size for activity reports, other action icons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:58:20 +00:00
snipe 65dae836c6 Set default sorting on backups to latest first 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:35:08 +00:00
snipe 456e6979f0 Updated import icons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:12:06 +00:00
Godfrey M 5eb08d9568 added a missing table header for checkout 2023-12-11 11:14:55 -08:00
snipe 778e45c9fd Fixed maintenances patch endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-07 19:36:12 +00:00
Godfrey M 49342a4542 added status names to asset history 2023-12-05 11:50:43 -08:00
Godfrey M a95f0b8862 remove column sizes 2023-12-05 11:07:52 -08:00
Godfrey M 15af64a355 fixed the bootstrap column sizes 2023-12-05 10:07:58 -08:00
snipe 7258af20fc Added help text to RTD location field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-05 14:40:49 +00:00
Godfrey M 0e9e31f68b adds info needed for license self activation 2023-12-04 11:12:30 -08:00
Godfrey M 4fd43799b4 missed one view 2023-12-04 10:56:03 -08:00
Godfrey M fdaa44654d changes the table header Serial to Product Key 2023-11-30 10:46:18 -08:00
snipe 42109dc1eb
Merge pull request #13976 from Godmartinz/sc-24144_final 
Fixed black dark theme, contrast issues etc
 2023-11-30 16:23:13 +00:00
Godfrey M 4a19f23e7c fixes for black dark theme 2023-11-29 11:30:02 -08:00
snipe 189c90e9e5
Merge pull request #13954 from Godmartinz/feature/sc-23756 
Fixed user total asset cost to appear conditionally
 2023-11-29 09:40:39 +00:00
snipe c35d234cde
Merge pull request #13959 from snipe/fixes/rebased_bulk_edit_fix 
Fixed status and model in bulk edit
 2023-11-29 09:40:03 +00:00
akemidx 63065bab5d adding in icons for clarity, since there are two places called settings 2023-11-28 17:51:43 -05:00
akemidx 108658520d translating no group message on user edit page 2023-11-28 17:15:51 -05:00
Godfrey M 9e59550b79 removes the row instead of just the optional values 2023-11-28 10:08:32 -08:00
snipe 601ebcc1e6 Removed table header contraint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 16:00:42 +00:00
snipe 2247be77d8 Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:56:20 +00:00
snipe 187d3abeb4 Use translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:15:07 +00:00
snipe fa1176ce14 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:14:12 +00:00
snipe 4723cfd4ba More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe c997ae44c2 FAFO troubleshooting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
Godfrey M 45e9d0597a makes user total asset cost appear conditionally 2023-11-27 11:36:47 -08:00
snipe dbb6002f9f Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-27 14:43:16 +00:00
snipe 776c91934b Updated dir name for Khmer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-27 14:39:13 +00:00
snipe 77ab5eb875
Merge pull request #13909 from akemidx/bug/sc-23999 
Hiding Order Column in Custom Fieldsets
 2023-11-24 19:10:42 +00:00
snipe 9607567b75 Check for the array key in $activeFile->first_row 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-24 10:08:35 +00:00
snipe 978bbeccc5 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 16:18:09 +00:00
snipe accfbc1b99 Show number of remaining seats and category in form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 16:18:03 +00:00
snipe 88cc234cbd Higher contrast for green dark skin 
Applies #13915 to develop

Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:28:43 +00:00
snipe ad6b286e10 Added default location to view-assets view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:01:39 +00:00
snipe 7f94b7df32 Removed refresh from asset view table 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:01:24 +00:00
snipe c6178bd619 Added translation for success password save 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:59:59 +00:00
snipe 3929c8f260 Nicer alert layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:57:54 +00:00
snipe 0e51a0935d Added language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 17:41:12 +00:00
snipe ffc1266d0e UI fix - don’t show the trash can icon on things that can be restored 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 17:41:06 +00:00
snipe fb125af0df Tweaked language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:09:50 +00:00
snipe 0ae91d305d Add the two_column_unique_undeleted translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:03:03 +00:00
akemidx e5a4214b8b hiding all order stuff 2023-11-20 20:32:14 -05:00
snipe fe2cfa0d38 Redirect if category is missing or invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:28:44 +00:00
spencerrlongg c7f90ad86d tested, working 2023-11-15 12:50:40 -06:00
snipe 9316ecb8d6 CLarified upload error text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-14 16:14:39 +00:00
snipe 4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769 
Changed data source input to select in new label engine
 2023-11-13 20:38:42 +00:00
snipe 4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations 
Added multi location sync for ldap
 2023-11-13 20:20:45 +00:00
snipe a24d21e683 Added new unescaped alert box 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:41:05 +00:00
snipe 3f8b63e053 Add linked text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:02 +00:00
snipe 26311e46b8 Fixed URL to favicon on default blade (used in 404 messages) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 11:38:48 +00:00
snipe b3a6cc633b
Merge pull request #13769 from Godmartinz/location-dropdown-duplication 
clarifies an address column under locations
 2023-11-08 08:59:07 +00:00
snipe bc9545ca96
Merge pull request #13823 from spencerrlongg/chore/sc-23922 
New Translation Strings for Custom Asset Export
 2023-11-08 08:57:20 +00:00
snipe cf42eca198
Merge pull request #13814 from ntbutler-nbcs/feature-location-history 
Added #13754 - asset history tab to locations view
 2023-11-08 08:55:07 +00:00
spencerrlongg 93101d36b8 removed refresh button on client tables 2023-11-07 15:07:24 -06:00
snipe d0cc42a068 Added employee number to user merge screeb 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-03 20:09:11 +00:00
Godfrey M 3b6a0d6525 allows multi location sync for ldap 2023-11-02 16:50:19 -07:00
spencerrlongg 8f75bb8706 fix translation strings 2023-10-31 21:38:52 -05:00
snipe e381bf978f
Merge pull request #13816 from snipe/bug/sc-23900 
Fixed datetime displayed on license edit for fields that should be date
 2023-10-31 16:59:12 +00:00
snipe 22996895d8 Check for valid model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 16:04:19 +00:00
snipe 28641493ca Check that the category exists 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:58:59 +00:00
snipe aa2a25dc19 Display the form errors correctly 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:30:49 +00:00
snipe 3495652827 Added checkboxes to intentionally remove field values in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:52:53 +00:00
snipe 209627e2cc Force format if dates are given 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:25:00 +00:00
Nathan Butler 79f380cbe7 Added asset history tab to locations view 2023-10-31 10:28:54 +11:00
Godfrey M 97953ae082 add missing translation string 2023-10-30 12:17:55 -07:00
snipe 8c46f4ef69 Added min_amt value to model detaul page 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-30 13:19:59 +00:00
gitgrimbo d556f0d275 Use parseEscapedMarkedownInline for more views 2023-10-27 15:37:56 +01:00
spencerrlongg 90eb3b86cf added user phone & address fields 2023-10-26 19:10:53 -05:00
snipe aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets 
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
 2023-10-26 15:56:47 +01:00
snipe 1ce95b6eac Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:34:27 +01:00
snipe 64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements 2023-10-26 13:36:18 +01:00
snipe ff72c4fbaa Added nicer formatting for fields in log meta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 09:17:28 +01:00
snipe 7042260871 More style polishing on custom fields in bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 04:23:11 +01:00
snipe 77d141d19c Don’t check the delete expected checkin by detault 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 03:56:02 +01:00
snipe 522aa96fcc Changed error variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 02:36:18 +01:00
snipe 4b6b36c639 Removed semicolon 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 01:49:14 +01:00
snipe 4a759f0a20 Added fingerprint icon for unique 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 01:49:01 +01:00
snipe 7509d57bf6
Merge pull request #13796 from snipe/feature/sc-23880 
Added optional custom fields to requestable assets page
 2023-10-25 20:57:54 +01:00
snipe da08f0e26f
Merge pull request #13584 from Godmartinz/Bulk_location_edit_fix_gh-13572 
added an option to bulk edit location & fixed location bug
 2023-10-25 20:57:18 +01:00
snipe 0feb56d931 Removed period 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 20:39:15 +01:00
snipe a0cae77278 Fixed weird layout quirk on smaller screens 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 20:21:07 +01:00
snipe 0f97c0601b Nicer show/hide if encrypted, warn if already encrypted 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 20:11:06 +01:00
snipe 3916bac95f Added warning translation for encrypted fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 20:10:46 +01:00
snipe 6264d90459 Removed ending period for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:45:11 +01:00
snipe 57d3b2d2ef Check for encryption 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:44:10 +01:00
snipe a202bf81fa Removed column widths, check for encryption and showable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:44:02 +01:00
snipe 43da292d60 Used short translation for sr-only text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:43:34 +01:00
snipe eb82bc290d Clarified translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:42:07 +01:00
snipe 3c6b79e807 Added new fields to blades 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 17:28:55 +01:00
snipe 3a37b80251 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 17:21:58 +01:00
snipe e7ef7f04f0 Removed periods for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 17:21:48 +01:00
snipe 8c93e79397
Merge pull request #13787 from inietov/fixes/errorexception_undefined_array_key 
Fixed ErrorException: Undefined array key in importer blade [sc-23864]
 2023-10-25 07:47:48 +01:00
Ivan Nieto Vivanco f2f3931fa9 Formatting correctly 2023-10-24 11:26:37 -06:00
snipe 944520bc5d Fixed notification formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-24 17:02:16 +01:00
snipe aae289e150 Added missing string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-24 17:02:07 +01:00
Ivan Nieto Vivanco 0c5d54dfde Create the language string to show in the importer GUI indicating the file is empty 2023-10-23 22:09:17 -06:00
Ivan Nieto Vivanco 49f6eef9df Places a text indicating that the file is empty and display it as an info text 2023-10-23 21:57:35 -06:00
Ivan Nieto Vivanco 8f8e5cb723 Adds condition to only process CSV if is not empty 2023-10-23 21:47:10 -06:00
Robert-Azelis 309f30f630
Update view.blade.php 
display marker if date of EOL is expired and show real EOL rate as diff between purchase date and eol date
 2023-10-22 18:38:59 +02:00
Robert-Azelis 04a867d12b
Update eol_date.blade.php 
read EOL date from database instead calculate on the base model EOL rate
 2023-10-22 18:32:20 +02:00
Robert-Azelis 7571d45d44
[Improvement[ Dashboard 
If multicompany option is enabled much more important for admin is to see on dashboard list of companies instead of locations.  
In other way if multicompanies option is disabled then locations are displayed.
 2023-10-22 17:41:33 +02:00
Godfrey M e0a4387b10 clarifies an address column under locations 2023-10-19 10:01:08 -07:00
snipe 38066bf162
Merge pull request #13758 from inietov/fixes/array_to_string_conversion_rb17355 
Fixed ErrorException: Array to String Conversion rb17355
 2023-10-18 19:09:13 +01:00
spencerrlongg 6b745930b5 what typo? 2023-10-18 13:00:13 -05:00
spencerrlongg 38de69b3da new validation rule 2023-10-18 12:41:24 -05:00
snipe 1be503b21a Make sure order number is not an array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-18 14:36:16 +01:00
snipe 0c86b67ed6 Added error reporting to UI 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-18 14:13:35 +01:00
snipe 787a64d313 Check for true/false explicitly on api table view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-18 13:05:06 +01:00
snipe 6d55d78280 Set resend acceptance to POST 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-09 16:13:41 +01:00
snipe e5f5802235 Added tighter controls for matching log ID and item_id 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-09 15:17:03 +01:00
snipe cd3b4754e8
Merge pull request #13704 from Godmartinz/feature/sc-23571_v2 
Added a check-in button on components tab of Asset view
 2023-10-05 14:28:37 +01:00
snipe 1dab4b59e9
Merge pull request #13693 from Godmartinz/bug/sc-9955 
added proper margin-top to sidebar menu on bigger resolutions
 2023-10-05 14:27:25 +01:00
Godfrey M 92776adb93 remove unnecessary changes 2023-10-03 12:31:58 -07:00
Godfrey M dee36fc294 adds component checkin to asset tab 2023-10-03 12:30:08 -07:00
Godfrey M 1e8f90bcf0 gives proper margin-top to sidebar menu on bigger resolutions 2023-10-02 11:46:08 -07:00
snipe 129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2 
Standardize Asset EOL Date
 2023-10-02 16:09:22 +01:00
snipe b7c390a257 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-02 14:23:22 +01:00
snipe 754ec7563a Fixed consumable user view route name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-29 15:15:03 +01:00
Marcus Moore ed77e8768c Re-order options 2023-09-28 12:33:27 -07:00
snipe c1f545a523
Merge pull request #13679 from Godmartinz/bug/sc-23688 
Fixed General Webhooks error messaging and validation
 2023-09-28 20:24:09 +01:00
Godfrey M 8792d654b6 added translations for messages 2023-09-28 12:15:17 -07:00
Marcus Moore 36638feac4 Add assigned to as option 2023-09-28 11:37:02 -07:00
snipe 0bf423cda9 Set modal focus to modal-name field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 19:16:40 +01:00
snipe 6fa0d42bc2 Fixed bug where license checkout/checkin notes were not being saved 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 15:40:18 +01:00
snipe bb7a41628a Fixed #13662 - added clipboard.js 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 15:06:55 +01:00
Marcus Moore a47e36c1e5 Add custom fields as options 2023-09-27 16:51:53 -07:00
Marcus Moore a4a25ab9d0 Remove a couple fields 2023-09-27 16:35:44 -07:00
Marcus Moore 518ae28a37 Improve option display values 2023-09-27 16:20:26 -07:00
Marcus Moore 74a891afbb WIP: Render select box for field options in label engine 2023-09-27 15:58:01 -07:00
snipe 7bcb28d8fd Commented out sortable columns 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-26 15:24:20 +01:00
snipe 660abeca9e
Merge pull request #13638 from marcusmoore/bug/sc-20704 
Fixed exception being thrown when selected import was deleted
 2023-09-26 15:00:35 +01:00
snipe 81ae32d3f9 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-26 14:33:51 +01:00
snipe 81a982fd77
Merge pull request #13650 from snipe/features/more_info_in_settings 
Features/more info in settings
 2023-09-25 13:46:00 +01:00
snipe 619712b927 Fixed table 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 13:45:46 +01:00
snipe 359cd2a267 A few more config options 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 13:28:13 +01:00
snipe bd0863d9c7 Added new translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 10:54:46 +01:00
snipe 28cd0085b7 Added Khmer as an available language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 10:54:32 +01:00
snipe 456d55c3bd Added some mail settings to /settings for easier reference 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-21 16:14:47 +01:00
Marcus Moore b1199100a0 Display error message if import file deleted before it can be selected 2023-09-20 17:22:12 -07:00
Godfrey M b7901ae2d8 dont allow redirects, messaging applied, general webhook validation applied 2023-09-20 12:54:34 -07:00
spencerrlongg 7dab59c98d fix for no eol, fix for optional in view 2023-09-20 14:17:30 -05:00
snipe 14c0517927 Fixed #13628 - removed duplicate favicon tag 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-19 10:21:38 +01:00
snipe 2a638e66f0 Added column re-ordering 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 21:53:34 +01:00
snipe 3ba8b60f54 Fixed regression that disabled sticky headers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 20:28:28 +01:00
snipe 131ccaa5b9
Merge pull request #12869 from Godmartinz/bug/sc-23134 
Fixed footer sizing issue
 2023-09-15 14:31:07 +01:00
snipe 860e7791ff Fixed #13592 - unable to delete model from view page 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 23:35:44 +01:00
snipe bbe7d9dde2 Removed stray space 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:08:53 +01:00
snipe 932c02cc54 Typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:08:30 +01:00
snipe 84b0ff76ed Revert large warning size 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:06:19 +01:00
snipe 273740b8f5 Fixed import error warning 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:04:23 +01:00
snipe 8f4ca9da57 Simplify upload messaging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 21:20:21 +01:00
snipe 8e41fb7b36 Removed stray text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 18:48:20 +01:00
snipe d0c4910a51 Fixed checkbox formatting on quickstart 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 18:44:02 +01:00
snipe b92327eb40
Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature 
Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]
 2023-09-14 12:52:13 +01:00
Marcus Moore 74c7f106ce Reset assigned_x values when changing check out to type 2023-09-13 13:43:35 -07:00
spencerrlongg 70a251de55 fix up gui edit 2023-09-13 13:51:14 -05:00
spencerrlongg ccf3fe40ec rm additional row 2023-09-11 17:35:13 -05:00
spencerrlongg 3a63bcab73 temporarily show on its own line 2023-09-11 17:35:13 -05:00
Godfrey M e73b16846e adds an option to bulk edit actual location for bulk edit and fixes update issue 2023-09-11 11:21:56 -07:00
Godfrey Martinez a26b96185b
Merge branch 'develop' into asset-model-notifs 2023-09-11 09:37:22 -07:00
snipe 65a76c599c Added inline=true to image preview modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 18:35:07 +01:00
snipe f53db8ba75 Fixed #13562 - allow inline view for uploaded files 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 18:28:01 +01:00
snipe 2acf2b880e Account for hard-deleted models, suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 15:58:21 +01:00
snipe b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost 
Added users total cost of assets to user profile
 2023-09-05 13:52:34 +01:00
snipe a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report 
Added last check in column and filter to custom asset report
 2023-09-05 13:22:15 +01:00
snipe 83b178f5b2 Added model name and number to dynamic url 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-31 18:03:32 +01:00
snipe c51574099f
Merge pull request #13507 from Godmartinz/ignore_encrypt_and_other_changes 
Added eager loading for `changedinfo` and removed encrypted values from Asset history
 2023-08-31 13:04:39 +01:00
snipe c0cbdb1fc4 Fixed bug introduced in #13528 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 15:48:35 +01:00
snipe 22d136df46
Merge pull request #13528 from inietov/fixes/cloning_model_blanks_fieldset 
Fixed #12548 Cloning a model blanks fieldset of new one
 2023-08-29 19:14:38 +01:00
Godfrey Martinez d86c63cf23
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable 2023-08-28 19:38:16 -07:00
Godfrey M 74f45a4473 reworks company queries for asset history 2023-08-28 19:35:46 -07:00
Ivan Nieto Vivanco 4e4ba38038 Pass the model_id variable in the controller and get it only if we are cloning the asset model 2023-08-28 16:23:26 -06:00
snipe 7787ca328c Try to prevent the browser from pre-filling the LDAP password 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 18:36:06 +01:00
snipe 582cad2dc5 Fixed #13521 - make modal “select files” button wider 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 12:37:42 +01:00
snipe 20e9f05a64 Tighter layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-26 17:43:02 +01:00
snipe 844fe0938c Added link to the help docs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-26 17:42:56 +01:00
Ivan Nieto Vivanco a12a68e4e9 Add a variable so I dont ended rewriting the original model 2023-08-24 15:28:12 -06:00
Ivan Nieto Vivanco 950536f59f Added a condition to send correct model id when cloning one 2023-08-24 15:18:51 -06:00
Godfrey M 8ebb9afedd adds min_amt to asset model edit, index, and table 2023-08-24 10:30:07 -07:00
Ivan Nieto Vivanco 7bfb5a0667 Disable the Checkin All Seats button if License is not reassignable 2023-08-23 16:36:06 -06:00
snipe 79b330f492
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error 
Fixed Asset acceptance error when user company and asset company don't match
 2023-08-22 15:49:56 +01:00
snipe da38945a53 Small fixes to checkbox layout in general settings blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-22 14:10:39 +01:00
snipe a48762c64d
Merge pull request #13496 from snipe/features/setting_for_name_order 
Fixed #13495 added setting for name order
 2023-08-22 12:50:58 +01:00
snipe 23237e5cd3 Removed unused translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-22 12:50:32 +01:00
snipe fea11ec7f1
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields 
Bulk Editing Custom Fields
 2023-08-22 12:40:18 +01:00
Marcus Moore c332b98456 Add last checkin options to report front end 2023-08-21 13:44:49 -07:00
Godfrey M 5076b45a0d adds id to history info 2023-08-21 13:40:39 -07:00
snipe 36a343365e Switched from fullName() to getFullNameAttribute() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:14:07 +01:00
snipe c617bf89b6 Tweak layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:13:45 +01:00
snipe ba0643f6a4 Added name display format, tweaked some 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:13:28 +01:00
snipe d73d15b8a2 Added form macro for name format 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:59 +01:00
snipe 8660d41aa3 Changed width of locale field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:45 +01:00
snipe c39579b170 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:25 +01:00
snipe 74384f14e4 Use clearer translation (from original PR) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-16 01:25:13 +01:00
Ivan Nieto Vivanco 25c58a8486 Fix typo in language variable name 2023-08-15 14:17:39 -06:00
snipe 7eaf3174ab
Merge pull request #13457 from snipe/fixes/remove_autocomplete_off_on_login 
Fixed #13365 - Added LOGIN_AUTOCOMPLETE as env var
 2023-08-15 20:55:05 +01:00
snipe 1c2f3cd552 Fixed translation typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:39:00 +01:00
snipe 0763b5135d Fixed checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:28:16 +01:00
snipe 253975ce72 Updated translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:27:55 +01:00
snipe fa6c8d864e Restore label engine checkbox 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:04:19 +01:00
snipe c957f136aa More label tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:03:40 +01:00
snipe 6b02184e99 Fixed weird layout with checkbox 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:48:20 +01:00
snipe e41368daac
Merge pull request #12050 from cram42/develop 
New Label Engine
 2023-08-15 17:58:57 +01:00
snipe c56f664811
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies 
Add email to companies
 2023-08-15 13:26:20 +01:00
snipe d1ce1b6f18 Updated language strings from CrowdIn 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 13:21:35 +01:00
Ivan Nieto Vivanco 71cb16118d Change error string for a better (?) one 2023-08-14 20:52:00 -06:00
Ivan Nieto Vivanco d365565b6d Add message in the acceptance assets view to indicate when the user can\'t accept nor deny the asset 2023-08-14 20:51:04 -06:00
snipe 24a3e0ee83 Added LOGIN_AUTOCOMPLETE as env var 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 01:56:01 +01:00
snipe d3fbbec92c
Merge pull request #13455 from snipe/fixes/confusion_around_localization_date 
Fixed #13382 - confusion around localization date
 2023-08-14 22:50:30 +01:00
snipe 9820ab34d7 Use today’s date for date format selectlist 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-14 22:44:29 +01:00
Godfrey M c3356ab765 fixed translation choice and color choice 2023-08-14 12:20:46 -07:00
Godfrey M 6b94ef6adc fixes the statuslabeltypeforatter instead of the model 2023-08-14 12:13:01 -07:00
snipe 58286c9cab Fixed case in BS table formatter for boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-14 13:01:32 +01:00
Robert-Azelis da701677c7
Update edit.blade.php 2023-08-13 17:24:17 +02:00
snipe a6a742d8d8
Merge pull request #13407 from marcusmoore/feature/sc-23465 
Added messaging to category edit page to improve clarity around when users will be emailed
 2023-08-09 10:36:19 +01:00
snipe 6a3a38b6f6 Call tooltip again on custom fields jquery 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 18:53:57 +01:00
snipe 40aca9709a Added container to the tooltip invocation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 18:52:26 +01:00
snipe bd4061e023 Change text on dropdown 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 08:18:56 +01:00
snipe 5bda73f151 Ugh - messing with the blade layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 08:18:40 +01:00
Marcus Moore d019e62d39
Remove lazy from eula field to avoid race condition 2023-08-02 18:22:40 -07:00
Ivan Nieto Vivanco 9ca163e8cf Stop asset acceptances from shown to user if full company support is enabled and companies not match 2023-08-02 19:22:35 -06:00
Marcus Moore b70a5280f9
Remove unneed jquery 2023-08-02 18:04:21 -07:00
Marcus Moore cbe5a9bc8a
Persist eula text even when field is disabled 2023-08-02 18:03:09 -07:00
Marcus Moore 2e7aa01abe
Pass checkin_email value to backend even when unchecked 2023-08-02 17:45:39 -07:00
Marcus Moore 896f038054
Set send email back to original value when eulas cleared 2023-08-02 17:03:56 -07:00
Marcus Moore 48979ce177
Disable send email when it should not be modified 2023-08-02 16:52:56 -07:00
Marcus Moore e12935f7fa
Disable eula textarea when using global eula 2023-08-02 16:18:57 -07:00
Marcus Moore 6400034435
Improve variable name 2023-08-02 16:06:59 -07:00
Marcus Moore 105c94aea9
Implement toggling message when email will be sent 2023-08-02 11:36:20 -07:00
Marcus Moore 6349d52803
WIP: migrate to livewire 2023-08-01 17:29:23 -07:00
Marcus Moore 65de9c5e07
Extract translation strings 2023-08-01 15:21:49 -07:00
Marcus Moore ebfc395e78
Improve messaging 2023-08-01 14:39:30 -07:00
Marcus Moore 5c8c2ca027
Improve variable names 2023-08-01 14:26:21 -07:00
snipe 2e1c3fb51b
Merge pull request #13295 from inietov/fixes/admins_cannot_view_encrypted_fields 
Fixed #11794 Admins Cannot View Encrypted Field
 2023-07-31 13:08:28 +01:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
Godfrey M 9c6e8d57aa removes typos 2023-07-25 11:44:16 -07:00
Godfrey M 11e3487263 custom field set order starts at 1 now 2023-07-25 11:41:08 -07:00
snipe a01cb26aac
Merge pull request #12940 from akemidx/delete_asset_from_view_page 
Delete button on asset view page
 2023-07-25 12:11:35 +01:00
akemidx e289e95721 no ? needed 2023-07-24 17:22:10 -04:00
akemidx b082d27c42 removing :item 2023-07-24 17:12:12 -04:00
snipe 1a771e6ab9 Check that the model is valid before trying to chain the relationship 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-21 14:46:58 +01:00
snipe 7f761000b4 Use slightly less terrifying and more accurate language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-21 14:46:39 +01:00
Ivan Nieto Vivanco ecf522243b Add the new rule to proper views and also in the Asset Transformer 2023-07-19 19:52:03 -06:00
snipe 33fd904c18
Merge pull request #13330 from akemidx/merge_users_typo 
merge users page typo fix
 2023-07-19 10:26:57 +01:00
akemidx 064e696521 merge users page typo fix 2023-07-18 15:33:33 -04:00
Marcus Moore 2eaab6d9fb
Change message to a callout 2023-07-17 12:23:31 -07:00
snipe c21a7db3c1 Moved warranty into manufactuer’s section 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-15 10:45:36 +01:00
snipe 3078cab7ee Added ability to show/hide custom fields in list views by default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 09:09:43 +01:00
snipe 4027acee46
Merge pull request #13184 from akemidx/department_in_side_bar 
User department now visible in side pane of asset view page
 2023-07-13 21:01:48 +01:00
snipe 5aa99a15d8
Merge pull request #13288 from snipe/fixes/line_based_markdown 
Added Inline markdown method
 2023-07-13 13:16:50 +01:00
snipe 5d1f294f0e Added parseEscapedMarkedownInline to accessories API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-13 12:03:01 +01:00
akemidx 1163af3c10 change to make sure department actually exists 2023-07-12 15:57:44 -04:00
snipe c1c2c38995 Fixed #13256 - Added option to switch to localStorage instead of cookies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 20:06:17 +01:00
snipe 44231fa52c
Merge pull request #13225 from inietov/fixes/change_default_location_at_checkin 
Fixed #13167 Default location not being set/updated upon check-in
 2023-07-12 19:14:53 +01:00
snipe 44b8558e38
Merge pull request #13233 from Godmartinz/barcode_adjusts_if_qr_code_ 
fixed margin if qr_code present
 2023-07-12 17:11:58 +01:00
snipe a569a99e61 Used inline markdown in views 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 16:57:04 +01:00
Marcus Moore 3df175fb3e
Improve variable name 2023-07-11 16:36:38 -07:00
Marcus Moore 44d8b2fd5e
Handle default eula checkbox 2023-07-11 16:36:03 -07:00
Ivan Nieto Vivanco e0df8cc4aa Add admin role to show encrypted customfield values 2023-07-11 17:21:32 -06:00
Marcus Moore af681d8190
Display message and update checkbox depending on EULA status 2023-07-11 16:12:43 -07:00
snipe b5695c9ab7 Test parsedown in notes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-11 12:20:47 +01:00
snipe ba37a9db8c
Merge pull request #13277 from snipe/features/added_phone_fax_to_locations 
Added phone, fax to departments, locations, companies
 2023-07-11 11:15:13 +01:00
Ivan Nieto Vivanco ec8cb1b09e Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash 2023-07-10 16:34:00 -06:00
snipe 14c61e4c17 Added phone, fax to departments, locations, companies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-10 19:44:21 +01:00
Marcus Moore ef160b0e15
Add span tag so label is displayed properly 2023-07-06 10:49:57 -07:00
Ivan Nieto Vivanco f4ca29b4a8 Only show radio inputs for location in checkin view 2023-07-06 11:36:55 -06:00
Ivan Nieto Vivanco 743e852998 Add radio buttons to alter asset checkin location behavior 2023-07-06 10:38:48 -06:00
Godfrey M d44e667697 fixed margin if qr_code present 2023-06-29 13:37:38 -07:00
snipe bbbeaaee2b
Merge pull request #13232 from Godmartinz/labels_overlapping_issue 
fixed barcode and info from overlapping
 2023-06-29 21:23:31 +01:00
Godfrey M df90e924b4 prevent labels from overlapping 2023-06-29 13:18:17 -07:00
akemidx d0212d4bda formatting fix 2023-06-29 15:39:19 -04:00
slong753 8cee3a8218 ok, @marcusmoore was right all along 
i just didn't get it
 2023-06-29 14:06:52 -05:00