ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,361 Commits 84 Branches 293 Tags
2b4d5222ebdc412ea2a373c788d424dbdd13e5f6
Commit Graph

19361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe 2b4d5222eb Made “add new” buttons clearer on table headers 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 12:17:29 +01:00
snipe 9604ecebad Fixed jobtitle in advanced search 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 12:01:59 +01:00
snipe 0d67970a45 Update @swift2512 as a contributor 2025-09-08 09:27:34 +01:00
snipe 913b9f0c40 Reworks PR #15490 - adds location to inventory email 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 09:26:36 +01:00
snipe 610a5745f0 Merge pull request #17818 from grokability/dependabot/github_actions/develop/actions/stale-10 
Bump actions/stale from 9 to 10
 2025-09-08 09:17:19 +01:00
dependabot[bot] dff12324c6 Bump actions/stale from 9 to 10 
Bumps [actions/stale](https://github.com/actions/stale) from 9 to 10.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v9...v10)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-version: '10'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-09-08 08:16:24 +00:00
snipe f340390fc8 Merge pull request #17703 from marcusmoore/17369-accessory-checkout-qty-scaffold 
Fixed issues around accessory acceptance
 2025-09-08 09:09:26 +01:00
snipe be81e74921 Shifted log meta position 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 08:24:50 +01:00
snipe 2bee8729e4 Better escaping for display_name in API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 08:14:33 +01:00
snipe 5d03038734 Use auto-direction for <p> in preview 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-05 15:12:38 +01:00
snipe 75b11de0f4 Bumped composer packages 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 19:55:30 +01:00
snipe c5bede8594 More small display_name fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 17:15:06 +01:00
snipe cd9ea6ae3b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:56:43 +01:00
snipe 113b762ec7 Fix for null location in locations print 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:55:44 +01:00
snipe 78704d8b85 Fixed #17803 - checked out to name in custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:51:10 +01:00
snipe 1109db76fe Merge pull request #17797 from grokability/#17796-search-on-model-name-and-number 
Fixed #17796 - search on model name and number on importer
 2025-09-04 16:35:43 +01:00
snipe b1b390febf Removed flaky test 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:30:02 +01:00
snipe be451fa0c0 Removed asset model from original factory 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:14:27 +01:00
snipe 1fa553c785 Use nths 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:04:16 +01:00
snipe 905f61371d Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 16:02:40 +01:00
snipe 7da5210a01 Switched to nth from fetchOne in CSV reader 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 12:50:12 +01:00
snipe 18172d3896 Merge pull request #17752 from marcusmoore/fixes/existing-assets-report 
Improve expiring alerts notification layout
 2025-09-04 12:33:32 +01:00
snipe c28e78b9e2 Merge pull request #16063 from Godmartinz/checkin_non_reassignable_license 
Allows check-ins of unreassignable licenses
 2025-09-04 11:22:17 +01:00
snipe e7827a3847 Merge pull request #17800 from marcusmoore/chore/test-action-logs 
Upload log file in GitHub Action tests
 2025-09-04 10:20:12 +01:00
Marcus Moore 039564e74c Wrap migration in check 2025-09-03 12:52:46 -07:00
Marcus Moore e164595a0f Fall back to displaying 1 2025-09-03 12:35:18 -07:00
Marcus Moore d29e09a3ff Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold 
# Conflicts:
#	resources/views/account/accept/create.blade.php
#	resources/views/account/accept/index.blade.php
 2025-09-03 12:26:43 -07:00
Godfrey M db9f85e9da Merge branch 'develop' into checkin_non_reassignable_license 
# Conflicts:
#	app/Models/License.php
#	resources/views/licenses/view.blade.php
#	tests/Feature/Checkins/Api/LicenseCheckInTest.php
 2025-09-03 11:09:51 -07:00
Marcus Moore 27022954b1 Inline icon 2025-09-03 10:44:19 -07:00
Marcus Moore 30362c924f Upload log as artifact 2025-09-03 10:13:01 -07:00
snipe bf63b15b46 Merge pull request #17799 from grokability/#17798-adds-require-serial-to-importer 
Fixed #17798 - added `require_serial` to model importer
 2025-09-03 15:32:42 +01:00
snipe 19aea4bd6c Fixed #17798 - added require_serial to model importer 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 15:25:56 +01:00
snipe 090890e9c6 Fixed #17796 - search on model name and number on importer 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 15:15:29 +01:00
snipe 605022a9e3 Merge pull request #17795 from grokability/#17791-larger-currency-field 
Fixed #17791 - increase size of purchase cost field
 2025-09-03 15:09:28 +01:00
snipe b06c58fe7b Switch to older style rules for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 15:06:27 +01:00
snipe f5c8b3eb04 Fixed #17791 - increase size of purchase cost field 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 15:03:49 +01:00
snipe 739980aa09 Merge pull request #16947 from Godmartinz/add-require-serial-to-models 
Adds require serial as Asset Model option
 2025-09-03 14:53:15 +01:00
snipe afde5943e3 Fixed typo - #17784 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 14:39:59 +01:00
snipe 32300cb42c Merge pull request #17788 from grokability/add-delete-log-instead-of-soft-deleting-the-log-itself 
Fixed #17777 - Log upload deletion
 2025-09-03 14:37:32 +01:00
snipe de3b1697c8 Merge pull request #17760 from Godmartinz/fix-translation-string-in-notifications 
Fixes #17759 translation used in asset check in/out notifications
 2025-09-03 14:33:57 +01:00
snipe a18fb10b5a Merge pull request #17783 from marcusmoore/fixes/company-in-location-print 
Fixed company name reference in location print
 2025-09-03 08:44:40 +01:00
snipe 52140dbe06 Log upload deletion 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 08:37:42 +01:00
Marcus Moore db5bb1928e Merge branch 'develop' into fixes/existing-assets-report 
# Conflicts:
#	resources/views/notifications/markdown/report-expiring-assets.blade.php
 2025-09-02 15:07:23 -07:00
Marcus Moore 65b66beb07 Make icon more prominent 2025-09-02 14:55:46 -07:00
Marcus Moore c83504b4e7 Use display_name in place of presenter 2025-09-02 12:57:40 -07:00
Godfrey M cd2e7ee31d fix google and slack notifications 2025-09-02 10:53:42 -07:00
Godfrey M c3a0a0415a fix MS Teams Notifications 2025-09-02 10:48:02 -07:00
snipe 709f4672b7 Merge pull request #17771 from grokability/#10107-remember-checkout-to-type 
Fixed #10107 - remember checkout to type
 2025-09-02 13:46:13 +01:00
snipe e6c030b050 Merge pull request #17781 from grokability/#17780-add-withtrashed-to-files 
Fixed #17780 - Added `withTrashed()` to allow viewing files on deleted objects
 2025-09-02 13:45:18 +01:00
snipe 7bd3a791a1 Added withTrashed() to allow viewing files on deleted objects 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-02 13:39:35 +01:00