ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,480 Commits 84 Branches 293 Tags
5df22b3e6a02abfed6549a3db2daa0f25a45d99e
Commit Graph

18480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Godfrey M
5df22b3e6a checkboxes properly check 2025-07-17 11:56:52 -07:00
Godfrey M
c8b213c190 remove some changes, move error bag 2025-06-24 13:10:32 -07:00
Godfrey M
942de9dce5 got validation to redirect back to form and display 2025-06-24 12:42:07 -07:00
snipe
6015aeddee Merge pull request #17209 from Godmartinz/saml_xml_update_bug 
Fixed #17089: SAML metadata now updating with new XML uploads
 2025-06-23 16:40:35 +01:00
snipe
7b04e30964 Merge pull request #17280 from grokability/fixes/#7246-manager-id-in-import 
Fixed #7246 - added manager employee/username number to importer
 2025-06-23 16:07:14 +01:00
snipe
6794f5e783 Added logging for manager import 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-23 15:46:04 +01:00
snipe
6e41ceff39 Fixed parameter order 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-23 15:41:56 +01:00
snipe
7ab47ff0de Fixed #7246 - added manager employee number to importer 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-23 15:11:57 +01:00
snipe
92d24d8702 Merge pull request #17277 from grokability/#17264-add-notes-to-bulk 
Fixed #17264: add notes to bulk asset edit
 2025-06-23 12:36:50 +01:00
snipe
bcbfd46682 Update controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-23 12:32:33 +01:00
snipe
bfd96a695f Add notes field and nulling checkbox 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-23 12:32:28 +01:00
snipe
f27e8534dc Make sure $item exists 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-23 12:32:15 +01:00
snipe
040cd7ddbf Updated string to use shorter version 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 20:56:37 +01:00
snipe
8d6b21a076 Merge pull request #17241 from spencerrlongg/bug/17239-possible-500-when-checking-in-license-assigned-to-a-soft-deleted-user 
Fixed #17239 - Add `withTrashed` User Search On License Checkin
 2025-06-22 20:14:03 +01:00
snipe
2d36b25017 Merge pull request #17258 from Robert-Azelis/patch-13 
Company info - user print assets
 2025-06-22 20:13:24 +01:00
snipe
1f9e4306ae Fixed #17261 - check for either old or new label engine QR 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 20:07:30 +01:00
snipe
5242e0b36e Merge pull request #17270 from grokability/fixes/#17249-order-by-location-in-maintenances 
Fixed #17249 - sort by location in asset maintenances
 2025-06-22 19:41:14 +01:00
snipe
e50505532e Fixes #17249 - sort by location in asset maintenances 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 19:38:39 +01:00
snipe
f05ef18d55 Merge pull request #17269 from grokability/fixes/#17256-user-eula-view 
Fixed #17256: fixed permissions for non-super-admins to view their own EULAs
 2025-06-22 19:29:41 +01:00
snipe
f6eccd7277 Added profile routes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 19:25:30 +01:00
snipe
4d1258c64b Fixed downloadformatter 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 19:25:17 +01:00
snipe
103cbfd038 Use profile eula API view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 19:25:05 +01:00
snipe
47069ad3f4 Added stored eula method on profile 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 19:24:45 +01:00
snipe
317f620992 Added profile controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 19:24:19 +01:00
snipe
8f43694582 Added eula download with user check in profile controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 19:24:06 +01:00
snipe
df30076ffd Update gate for user 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 19:23:50 +01:00
snipe
f81750617e Fixed mismatched html header tag 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-22 17:30:13 +01:00
Robert-Azelis
e4534c4319 Company info - user print assets 2025-06-20 10:33:09 +02:00
snipe
d6c09aae6b Updated paveit command to delete by user_id instead of ID 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-18 21:15:04 +01:00
spencerrlongg
d3d5230d0c add with trashed to user search 2025-06-17 19:15:13 -05:00
Godfrey M
8199cd2118 comment merge methods for now 2025-06-17 10:59:57 -07:00
snipe
9f02b80cf1 Merge pull request #17233 from grokability/fixes-#17232-duplicate-expected-checkin-field 
Fixed #17232 - removed duplicate expected_checkin field on asset edit/create
 2025-06-17 18:14:36 +01:00
snipe
d3e4e81168 Fixed #17232 - removed duplicate expected_checkin field 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 18:08:21 +01:00
snipe
38195c0a8f Merge pull request #17225 from grokability/fixes-ui-issues-in-manager-view 
Fixes #17227 and #17228 - UI issues in manager view
 2025-06-17 17:28:52 +01:00
snipe
5fa11e4278 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 16:57:26 +01:00
snipe
c39b52fcb5 Move select list closer to the table, removed awkward icon 
This makes the view more consistent with the normal layout and removes the CSRF that was being passed in the GET on the form.submit

Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 16:57:17 +01:00
snipe
ec65fc1e65 Move manager view option to misc section 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 16:56:56 +01:00
snipe
32d8646d96 Add @lukaskraic as a contributor 2025-06-17 16:26:17 +01:00
snipe
e8835fc2b1 Merge pull request #17096 from lukaskraic/feature/manager-view-v2 
Manager View Feature
 2025-06-17 16:24:40 +01:00
snipe
054a06c5dc Update resources/lang/en-US/admin/settings/general.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2025-06-17 15:39:26 +01:00
snipe
d66b6cfee6 Merge pull request #17220 from grokability/added-advanced-search-to-activity-log 
Added advanced search to activity log
 2025-06-17 13:24:31 +01:00
snipe
89c0427b2f Added fullscreen option 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 13:24:02 +01:00
snipe
3fec10d447 Added advanced search to activity log 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 13:20:39 +01:00
snipe
f8b4981bfe Merge pull request #17219 from grokability/fixes-#17213-search-by-admin 
Fixes #17213:  search by admin (created_by) in activity report
 2025-06-17 13:02:51 +01:00
snipe
130669a2f9 Added adminuser relationship in Searchable to concat first name and last name 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 13:01:57 +01:00
snipe
c2c79ee231 Make created_by searchable 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 12:56:39 +01:00
snipe
86f10bd702 Added employee number to searchable relation 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 12:56:30 +01:00
snipe
b496a06fc0 Merge pull request #17218 from grokability/fixed-#17212-hide-columns-on-print 
Fixed #17212 - hide columns from print view
 2025-06-17 12:37:43 +01:00
snipe
f865a6cb37 Added 'printIgnore' => true, to presenters to hide checkbox and action column from print view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 12:35:05 +01:00
snipe
89186ea4f8 Merge pull request #17195 from grokability/#17192-fixes-wonky-layout-on-bulk-edit 
Fixed #17192 - wonky layout on bulk edit screens
 2025-06-17 11:55:31 +01:00