mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-11-01 16:18:45 +00:00
Code Issues Projects Releases Wiki Activity
20,352 Commits 81 Branches 232 Tags
Commit Graph

221 Commits

Author SHA1 Message Date
snipe
1f79776b8f Pull HTML tags out before converting markdown 2025-09-16 19:21:39 +01:00
snipe
01f7b5d709 Added CJK and Arabic font support 2025-09-15 14:46:11 +01:00
snipe
72466f1aab Revert "Merge pull request #17823 from grokability/#17822-fix-n+1-in-topmenu" 
This reverts commit 6901deccbf14980885af66fec59ea06797814c3c, reversing
changes made to 6b87c90e023f59434adb3d9678e9e4fe85874cb2.

Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 15:04:28 +01:00
snipe
5a9c906eb9 Added filter to assets loading 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 14:32:58 +01:00
snipe
b95b60b49e Use eager-loaded model assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 14:07:49 +01:00
snipe
14408ef18f Fixed n+1 in top menu check 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 13:55:22 +01: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
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
snipe
9b4101855f Undo double-float 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-18 15:24:15 +01:00
snipe
f12a3bb08b Fixed #10306 - cast purchase cost to a float 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-11 18:12:37 +01:00
Godfrey M
18e49e9067 only redirect to previous page if not creating 2025-08-05 12:05:22 -07:00
Brady Wetherington
0ee3cca4da Use a Video tag for video files for non-Safari usage 2025-07-09 15:15:53 +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
dc43d85323 Check for audio files 
Signed-off-by: snipe <snipe@snipe.net>
 2025-07-03 20:15:30 +01:00
Godfrey M
76f59f7b85 fix variables 2025-07-01 12:52:16 -07:00
Godfrey M
55ebb4671f update check in and check out controllers 2025-07-01 12:44:26 -07:00
Godfrey M
8a9cf07063 editing controllers and edit blades for other categories 2025-07-01 12:31:55 -07:00
Godfrey M
ca9ff8cf19 set return type for RedirectOptions 2025-07-01 12:04:02 -07:00
Godfrey M
7217d9c427 adds redirect to previous page, use match instead of switch cases 2025-07-01 11:55:46 -07:00
Godfrey M
9d712ad8f1 clean up code 2025-07-01 10:56:02 -07:00
Godfrey M
f3e49e7010 add asset model as a redirect option 2025-07-01 10:43:00 -07:00
snipe
5d46d90725 Added category importer 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-02 04:11:54 +01:00
snipe
a5b88982bf Added manufacturer icon 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-02 02:52:55 +01:00
snipe
12a2c71b90 Added icon 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-29 14:47:59 +01:00
snipe
bafff9020a
Merge pull request #16611 from Godmartinz/MS_teams_deprecation_update 
Reworked MS Teams deprecation warnings and notifications visibility
 2025-05-09 16:38:25 +01:00
snipe
5c11a8c1e0 Modified helper 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-06 16:12:06 +01:00
Godfrey M
3b34654dd7 Merge branch 'develop' into MS_teams_deprecation_update 
# Conflicts:
#	resources/lang/en-US/admin/settings/message.php
 2025-05-05 09:33:32 -07:00
snipe
83d6e9ad8a Removed log error 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-05 14:00:05 +01:00
snipe
4469db0bd3 Livewire component for smoother check for location companies 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-05 13:55:28 +01:00
Godfrey M
ee31bfbcd4 Merge branch 'develop' into checkin_non_reassignable_license 
# Conflicts:
#	app/Helpers/Helper.php
#	app/Http/Controllers/Api/LicenseSeatsController.php
#	app/Http/Transformers/LicensesTransformer.php
 2025-04-21 10:49:35 -07:00
snipe
e71e25955a Check for array 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-21 12:20:03 +01:00
snipe
fa9ac3c449 Return value as int 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-21 11:53:26 +01:00
snipe
cd20486fe2
Merge pull request #16667 from Godmartinz/user-redirect-checkin-option 
Adds option to redirect back to checkedInBy user for assets/licenses/accessories
 2025-04-16 20:54:47 +01:00
Godfrey M
9824f43780 added other target options to accessories and assets 2025-04-09 10:50:42 -07:00
Godfrey M
af53559ca3 cleaned up code 2025-04-08 11:54:50 -07:00
Godfrey M
17b8ea9c86 removed unnecessary code 2025-04-08 11:51:29 -07:00
Godfrey M
b7492928ad reworked checkedInBy, added option logic to accessories 2025-04-08 11:43:02 -07:00
Godfrey M
a602b2fd47 adds option to redirect back to checkedInBy user for assets 2025-04-08 10:09:43 -07:00
snipe
890702f66d A few more display tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 17:47:39 +01:00
snipe
ea365e5645 More fields visible 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 16:17:57 +01:00
snipe
548ae49c69 Small tweaks to table 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 15:30:07 +01:00
snipe
da2c760227 Renamed variables, skipped breaking out of loop 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 15:13:19 +01:00
snipe
44ee287cc0 Nicer formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 12:34:00 +01:00
snipe
43c15ef134
Merge branch 'develop' into feature/locations_with_companies 2025-04-08 09:18:48 +01:00
snipe
0e65498799 Added webp as inline-able images 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 15:24:03 +01:00
Godfrey M
29d0380db3 reword warning messages, remove warning if webhook cleared and saved, deprecations only for superadmins 2025-04-01 11:53:32 -07:00
snipe
ecc0e76e7b Fixed route parameters for helper 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 05:03:39 +00:00
Tobias Regnery
4e0bcac1a1 Furhter validation for scoped locations 
There is a new validator introduced that checks on object update (assets, users, etc.) if the company matches the locations company.
In case of the creation of a new location it must be checked that the parent matches the own company.
On updating a location a check for every related object must be made to see if the company matches the location.

Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
 2025-01-24 11:12:11 +01:00
Tobias Regnery
6921df9334 Check for inconsistencies before activating scoped locations 
Before activating scoped location all locations and their related objects will be checked.
If there are locations with different companies than the related objects error out.

Because this operation is quite slow, bail out on the first inconsistent entry.
There is a new artisan command introduced that checks every location.

Depending on the size of the database, this will take very long.

Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
 2025-01-23 15:26:04 +01:00
Godfrey M
2143952a1e removed unused models, castged unreassignable_seat, clean up in general 2025-01-21 11:43:47 -08:00