DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 10:04:13 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
15254 commits 96 branches 267 tags 295 MiB
Commit graph

358 commits

Author SHA1 Message Date
snipe a77a7065d7 Added order by admin to assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:34:10 +01:00
snipe 1582d81e5b Change user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 22:16:41 +01:00
Godfrey M cf07186ae8 gives priority to default eula being checked vs catregory eula 2024-09-03 12:23:23 -07:00
snipe 4e4930ba62 Check for array 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 21:01:48 +01:00
snipe e62a802926 Use whereIn instead of where = 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 17:51:44 +01:00
snipe de29c1d8a0
Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days 
Added #15312: Add checkin due in days setting
 2024-08-16 10:21:36 +01:00
Glukose1 d8df52cc8f Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field. 2024-08-15 12:20:51 +02:00
snipe ce33deed86 Remove unused use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-10 17:14:34 +01:00
snipe 71729f0b16 Load admin and model on assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-10 17:00:20 +01:00
Spencer Long 64be353156
Merge branch 'develop' into bug/sc-24884 2024-07-23 12:55:19 -05:00
snipe ae9085b11f Modernize use statements, switch to auth() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:49:22 +01:00
spencerrlongg 6f29c0a7cf Merge branch 'refs/heads/develop' into bug/sc-24884 
# Conflicts:
#	routes/api.php
 2024-07-02 15:48:39 -05:00
snipe c6a0212384 Merge remote-tracking branch 'origin/master' into develop 2024-06-22 17:33:12 +01:00
snipe 3531256c3f Fixed deprecations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-21 21:06:43 +01:00
snipe 61ced0b221 Merge remote-tracking branch 'origin/develop' 2024-06-19 11:41:11 +01:00
snipe ae7675fee0 Added audit date validation back in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:37:15 +01:00
snipe 66ed26fbf9 Merge remote-tracking branch 'origin/develop' 2024-06-19 11:13:47 +01:00
snipe 7099358985 Added accessor/mutator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:11:50 +01:00
snipe 9a706b3e3e Removed datetime validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:05:31 +01:00
snipe d87da78eb5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Users/UsersController.php
#	config/version.php
#	public/css/build/AdminLTE.css
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all-defer.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-06-17 11:18:33 +01:00
snipe 1cdec61be6 Use more modern mutator/accessory syntax 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:56:54 +01:00
snipe 9d9ad86dd5 Added mutators and accessors for dates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe b2a86e312b Added last_checkout and last_checkin as fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe fb233c0aa4 Cleaned up facade names and references 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:38:15 +01:00
snipe 8ac3937bf4 Commented model loading on asset model 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 18:03:19 +01:00
spencerrlongg 8ce577db37 adds @snipe's rules for undeleted assigned targets 2024-05-23 15:51:26 -05:00
Spencer Long cdb1140f10
Merge branch 'develop' into bug/sc-24884 2024-05-23 13:53:00 -05:00
snipe eb0fd2f519 Removed stricter validation :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 16:29:11 +01:00
snipe 71b5bf2eef Added visual on the hardware view screen 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe bdbfb0f2a1 Added accessor and mutator for next_audit_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe a398496dd4 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:01:27 +01:00
snipe 839db8ef44 Refactored due-or-overdue methods 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 20:59:27 +01:00
snipe 50d8b02f8b Removed unused scope 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:23:27 +01:00
snipe 52d6a8990a Check that the asset is not already checked in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:06:46 +01:00
snipe d40604b574 Removed debugging, added date cast 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:05 +01:00
snipe 2e92ee8eee Switch to whereBetween so tests run on sqlite 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:23 +01:00
spencerrlongg 107f8db9bc another option 2024-04-23 17:35:33 -05:00
Spencer Long 4ab75c1c03
Merge branch 'develop' into bug/sc-24884 2024-04-03 14:08:41 -05:00
snipe 0d3d172108 Make last_checkin searchable and fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 20:37:40 +00:00
spencerrlongg 701411c1b9 get rid of a couple unnecessary changes 2024-03-27 13:53:57 -05:00
Spencer Long 013463aafc
Merge branch 'develop' into bug/sc-24884 2024-03-27 12:45:45 -05:00
spencerrlongg 39c15b2868 reformat array 2024-03-27 10:35:25 -05:00
snipe e9e6f925bf Updated validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-21 18:34:39 +00:00
snipe 828b84084d Added validation for last_audit_date and next_audit_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-21 18:29:38 +00:00
spencerrlongg e3e01e07b1 final cleanup 2024-03-20 15:23:45 -05:00
spencerrlongg f6ab0f8f46 lots of cleanup to do, but this DOES work 2024-03-13 15:57:10 -05:00
spencerrlongg f01b205486 some changes 2024-03-13 15:10:51 -05:00
spencerrlongg 8962ced038 push to switch branches 2024-03-13 10:40:50 -05:00
spencerrlongg 04d7884af8 some more testing stuff 2024-03-12 23:17:40 -05:00
spencerrlongg 6732b6601e some cool progress, but something with unique not working 2024-03-12 18:33:59 -05:00