DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14581 commits 97 branches 266 tags 291 MiB
Commit graph

690 commits

Author SHA1 Message Date
Godfrey Martinez c96ccbb6cb
Merge branch 'develop' into depreciation_percentage 2024-07-24 12:12:28 -07:00
Spencer Long 64be353156
Merge branch 'develop' into bug/sc-24884 2024-07-23 12:55:19 -05:00
snipe fecd877e8b Migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 17:35:06 +01:00
snipe ca7c0aa47c Added default avatar to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:59:25 +01:00
Godfrey M aaa2858337 battling with handling depreciation percentage and amount 2024-07-16 12:25:19 -07:00
snipe 24ad74f136 Updated factories 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 08:21:18 +01:00
snipe ae9085b11f Modernize use statements, switch to auth() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:49:22 +01:00
snipe 5e97ed1c7e Added migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:24:11 +01:00
snipe 9f1e59cf78 Marcus’ nitpicks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:01:41 +01:00
snipe d66d6e70a6 Added checkedOutToUser factory for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:18:53 +01:00
snipe 4635e9269d Added user update log factory 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:18:34 +01:00
snipe d27a025347 Added factories 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:30:06 +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 72affd7a5b Added migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:31 +01:00
snipe d27bde6047 Added deleted factory for tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 18:36:24 +01:00
Brady Wetherington 28b450fd3c Add index to 'parent_id' for users with large number of locations 2024-05-27 15:38:42 +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
Marcus Moore 8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-05-22 16:09:27 -07:00
snipe de088d452f
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance 
Adds a note text area to asset acceptances/declines
 2024-05-16 15:06:05 +01:00
spencerrlongg 17ef20ea92 alright, in a working place 2024-05-07 14:08:47 -05:00
spencerrlongg e177993bcc notes and some playing around, push for eod 2024-05-01 16:57:11 -05:00
spencerrlongg 6a7f3ecc2e new test not quite working, almost there 2024-05-01 16:12:56 -05:00
Spencer Long 53ccd196d7
Merge branch 'develop' into bug/sc-24884 2024-04-23 13:57:59 -05:00
Marcus Moore 155f5f35cd
Remove todo 2024-04-22 15:47:05 -07:00
Marcus Moore e16c04250e
Improve model factories 2024-04-16 16:58:28 -07:00
Marcus Moore c6d9da1571
Remove unneeded fields in factory state 2024-04-16 12:36:41 -07:00
Marcus Moore ab561d1ce8
Simplify factory state 2024-04-16 12:36:13 -07:00
Brady Wetherington 266424ff0e Some simple renames for better readability as suggested by Marcus 2024-04-16 15:17:02 +01:00
Brady Wetherington 67a8e0b5c6 This re-enables the ability to update encrypted custom fields via the API 2024-04-15 18:46:11 +01:00
Marcus Moore 6b6e18695f
Account for null asset in factory state 2024-04-10 16:12:47 -07:00
Marcus Moore deaba46e1c
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-04-10 11:01:35 -07:00
Spencer Long 4ab75c1c03
Merge branch 'develop' into bug/sc-24884 2024-04-03 14:08:41 -05:00
Godfrey M 43c32fa1bf fix class name in migration 2024-04-03 11:47:08 -07:00
Godfrey M c01bdb42fc renamed migration 2024-04-03 11:39:17 -07:00
akemidx b124b9af4d adding in change to settings table 2024-03-26 16:50:39 -04:00
Godfrey M 21c3b1fbd2 rename declined message to note, increased width of textarea 2024-03-21 14:03:25 -07:00
Marcus Moore b368acf941
Implement test case 2024-03-20 17:46:09 -07:00
Marcus Moore 984cc7a4f2
Scaffold tests around asset checkout via web 2024-03-20 13:29:25 -07:00
spencerrlongg e1addc5aef oops, typo from conflict resolve 2024-03-20 13:16:36 -05:00
Spencer Long b4b4927370
Merge branch 'develop' into bug/sc-24884 2024-03-20 12:36:39 -05:00
spencerrlongg 86ab880c90 buncha progress 2024-03-19 15:34:59 -05:00
akemidx 8640cad033 was using lcoations and not locale. fixed 2024-03-19 16:11:32 -04:00
akemidx dc29717623 fixing default 2024-03-19 15:51:05 -04:00
Godfrey M b9986033cc removed abbr. of variable, changed variable types in migration 2024-03-18 16:03:40 -07:00
akemidx 3680e04817 migration to set legacy locations to an standardized format 2024-03-18 18:29:59 -04:00
Godfrey M 8b52d5da85 fixed typos, reordered jquery, fixed migrations 2024-03-18 12:36:54 -07:00
Godfrey M 4588393b76 adds declined msg to mail notif, updates lang files and checkout acceptance controller 2024-03-18 10:25:55 -07:00
snipe a4941031cb
Merge pull request #14260 from marcusmoore/chore/sc-24808 
Added tests around asset check in and added missing actions to the api controller action
 2024-02-28 13:34:12 +00:00
snipe ee75df0f0a
Merge pull request #14346 from snipe/feature/sc-18728 
Added `min_amt` functionality to licenses
 2024-02-28 11:26:25 +00:00