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

18666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe a1b1498106 Merge remote-tracking branch 'origin/develop' 2025-06-17 17:51:37 +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 1158851ea7 Merge remote-tracking branch 'origin/develop' 2025-06-17 15:57:12 +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 e1ab9e959e Merge remote-tracking branch 'origin/develop' 2025-06-17 13:03:27 +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 2bbac3ae9d Merge remote-tracking branch 'origin/develop' 2025-06-17 12:38:52 +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
snipe fb19985186 Use the same variable for fieldset closing tag 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 11:52:47 +01:00
snipe e889b1d5e5 Merge remote-tracking branch 'origin/develop' 2025-06-17 11:42:00 +01:00
snipe ebc6e1221a Merge pull request #17198 from akemidx/ghissue-16241 
Fixed #16241 - menu items not getting class="active" on click.
 2025-06-17 11:40:56 +01:00
snipe 233bf856f4 Merge remote-tracking branch 'origin/develop' 2025-06-17 11:39:12 +01:00
snipe 2b91dcb700 Merge pull request #17216 from grokability/#17215-wrong-logo-check-in-print 
Fixed #17215: Check for acceptance logo vs regular logo
 2025-06-17 11:38:19 +01:00
snipe 9d2e333fd6 Check for acceptance logo vs regular logo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 11:36:10 +01:00
akemidx 418566db3f fixes the easy ones 2025-06-16 18:41:36 -04:00
snipe bca843e06c Merge remote-tracking branch 'origin/develop' 2025-06-16 20:32:40 +01:00
snipe 7be9463be6 Merge pull request #17180 from grokability/#12653-added-jobtitle-to-asset-listing 
Fixed #12653 - added jobtitle to asset listing
 2025-06-16 20:29:01 +01:00
snipe 51712bc7d6 Check for whether any of the models have a fieldset 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-16 16:40:07 +01:00
snipe 7b889d22d2 Fixed HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-16 16:14:01 +01:00
snipe 30a79a1278 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
v8.1.16 		2025-06-16 14:45:53 +01:00
snipe e8aad989ec Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-16 14:27:47 +01:00
snipe 4006d64d60 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-16 14:25:59 +01:00
snipe d792d99375 Removed stray space for favicon 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-15 03:51:50 +01:00
snipe 0f92dee2c4 Merge remote-tracking branch 'origin/develop' 2025-06-15 03:41:23 +01:00
snipe b11036a2e5 Fixed #11977 - changed path in backups language 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-15 03:40:54 +01:00
snipe f04efede15 Merge remote-tracking branch 'origin/develop' 2025-06-15 02:59:47 +01:00
snipe 01de69a250 Merge pull request #17181 from grokability/fixed-#14542-missing-fullscreen-in-locations 
Fixed #14542 - added fullscreen option for location view tabs
 2025-06-15 02:57:51 +01:00
snipe 5e1c2e7feb Fixed #14542 - added fullscreen option for location view tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-15 02:56:07 +01:00
snipe b842aa11e5 Remove debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-15 02:25:25 +01:00
snipe ff01078b60 Fixed #12653 - adds job title to asset listing 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-15 02:23:53 +01:00
snipe f0dfdf6720 Merge remote-tracking branch 'origin/develop' 2025-06-14 23:56:06 +01:00
snipe b1e92293fc Merge pull request #14998 from timoschwarzer/feature/department-manager-in-table 
Added #14997: Display department manager in user view and list
 2025-06-14 23:51:41 +01:00
snipe 443f69bd82 Merge branch 'develop' into feature/department-manager-in-table 2025-06-14 23:48:52 +01:00
snipe e26d731382 Merge remote-tracking branch 'origin/develop' 2025-06-14 23:08:48 +01:00
snipe f4decbf52e Fixed #15480 - adds location to acceptance email 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-14 23:08:37 +01:00
snipe d684d3e559 Merge remote-tracking branch 'origin/develop' 2025-06-14 22:22:54 +01:00
snipe bd2c311e4f One more fix to bulk menu 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-14 22:22:42 +01:00