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

143 Commits

Author SHA1 Message Date
Marcus Moore 9edec9e212 Extract translation 2025-09-25 11:09:27 -07:00
Marcus Moore fb9fb9c097 Merge branch 'develop' into fixes/17404-prevent-bulk-checkout-across-companies 
# Conflicts:
#	app/Http/Controllers/Assets/BulkAssetsController.php
#	tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php
 2025-09-22 10:52:04 -07:00
Marcus Moore ac8a9e38f0 Implement fix 2025-09-18 17:18:27 -07:00
Marcus Moore a02a96d5c4 Extract translation string 2025-09-18 12:57:56 -07:00
Godfrey M 384652b3df add total cost to accessories 2025-09-16 10:10:49 -07:00
snipe ec47ee3573 Merge pull request #17850 from Godmartinz/change-purchase-cost-to-unit 
Rewords Purchase cost to Unit Cost for Accessories, Components, Consumables
 2025-09-15 14:20:04 +01:00
snipe 05f6622912 Added status to URL 2025-09-15 13:13:32 +01:00
Godfrey M 990cd82f97 change purchase cost to unit cost in several places 2025-09-11 10:46:20 -07:00
snipe 0004d4936c Cleaned up print view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-09 15:18:28 +01: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
snipe 52140dbe06 Log upload deletion 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 08:37:42 +01:00
Godfrey M c5c68e9dd5 fix dropdown link color and skin names 2025-08-28 11:49:37 -07:00
snipe 0d7ec43262 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 06:19:41 +01:00
snipe 454be01a6c Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 06:11:23 +01:00
Marcus Moore 4298aad008 Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold 
# Conflicts:
#	app/Http/Controllers/Account/AcceptanceController.php
#	resources/views/notifications/markdown/asset-acceptance.blade.php
 2025-08-26 11:39:52 -07:00
Godfrey M dd742a2e4a add a check for audit notification variables in MS Teams and a translation 2025-08-25 15:10:41 -07:00
snipe 618106c103 Fixed #17674 - added odp, ods, odt to accepted files 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 14:11:20 +01:00
Marcus Moore 59bd6ca360 Update button text 2025-08-14 13:21:11 -07:00
Marcus Moore 22fe9a786e Display number of items being accepted 2025-08-14 12:36:46 -07:00
snipe 4038a22093 Added sidenav to filter on activated vs inactive users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-11 20:41:55 +01:00
snipe 8662aa2277 Put remaining seats back on license view for now 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-06 16:33:02 +01:00
snipe d2a2c63070 Added dropdown menu for users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-04 22:25:23 +01:00
snipe 1d8493d388 Improved messaging for cloning/editing assets that inherit images 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-04 20:51:24 +01:00
snipe f1dd84edba Added option to clone original images 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-04 18:47:26 +01:00
snipe 136de4208e Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-29 21:44:45 +01:00
snipe 33880393ac Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-28 23:32:00 +01:00
snipe 0cd5136052 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-17 20:12:52 +01:00
snipe 3795c74814 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-15 14:12:26 +01:00
snipe e96daf469a Better phrasing 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-09 21:00:54 +01:00
snipe 48588f6a9e Small UI sugar on the acceptance/signature screen 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-09 20:08:19 +01:00
snipe ab30a96d16 Merge pull request #17327 from Godmartinz/asset_model_redirect 
FIXED: #15861 adds a redirect option for asset model and previous page
 2025-07-07 14:00:31 +01:00
snipe 3e9098907a Use config file for file types/mimes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-03 20:11:31 +01:00
snipe b135c1eac2 Updated language strings in view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-02 18:15:06 +01:00
snipe 556a9039e9 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-02 17:53:55 +01:00
Godfrey M 7217d9c427 adds redirect to previous page, use match instead of switch cases 2025-07-01 11:55:46 -07:00
snipe d8e7123576 Added uploaded files API controllers and presenters 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-27 11:37:31 +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 5fa11e4278 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-17 16:57:26 +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
Marcus Moore 6c1adff5c8 Extract translation string 2025-06-09 15:33:39 -07:00
snipe ec8ddc197f Merge branch 'develop' into fix_action_date 2025-06-06 17:18:27 +01:00
Godfrey M ee3deb9c63 made eula api route, formatted table, cleaned up code 2025-06-04 15:04:59 -07:00
Godfrey M 6f4cee6334 adds Eula tab and count to user account 2025-06-04 11:38:50 -07:00
snipe 9aac183318 Added aria tag for accessibility 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-04 10:40:05 +01:00
snipe c8c2867305 Remove unused translation 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-04 10:39:08 +01:00
snipe 3e1f71026c Fixed #16240 - made additional strings translatable 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-04 10:37:04 +01:00
Lukas Kraic 84ec5aea26 Manager View Feature 2025-06-04 09:07:26 +02:00
snipe c08ce901cc Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-29 16:07:19 +01:00
snipe 3e0dec4856 Fixed #16893 - more specific upload failure text 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 15:38:38 +01:00
snipe d1be13e7d4 Added button text to translations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-30 14:32:29 +01:00