DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
12563 commits 97 branches 266 tags 292 MiB
Commit graph

3960 commits

Author SHA1 Message Date
snipe 66c24e152f
Merge pull request #14114 from uberbrady/preserve_sort_in_label_generation 
Fixed [FD-39640]: preserve sort order when generating asset labels
 2024-01-11 21:46:01 +00:00
snipe f610afb1b8
Merge pull request #14121 from Godmartinz/checkout_bug_fix 
Fixed multiple click checkouts for consumables, accessories and components
 2024-01-11 11:15:48 +00:00
Godfrey M 1f7f9717c5 fixes checkout bug 2024-01-10 11:35:32 -08:00
MrM 9d16eacad5
Added license expiration date in "view asset" 
I've added the expiration date of the license associated with an asset in hardware/ID#software, it is useful to see all of them on the asset page instead of having to open the license details page. I've also fixed a space formatting issue.
 2024-01-09 18:30:51 +01:00
Brady Wetherington 4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
snipe 7c5d29ccd9 Move Google Login prompt higher, made it bigger 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 14:56:34 +00:00
snipe 432f05586e
Merge pull request #14100 from Godmartinz/fix-license-seat-department-link 
fixed `departmentNameLinkFormatter` url
 2024-01-04 22:40:24 +00:00
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
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