DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
7021 commits 101 branches 268 tags 288 MiB
Commit graph

7021 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 503c802d70
Merge pull request #10416 from uberbrady/yank_assetlogs_from_asset_api 
Yank assetlog from eager-load clause in API query for develop
 2021-12-10 19:09:55 -08:00
Brady Wetherington ea71086dfc Yank assetlog from eager-load clause in API query for develop 2021-12-10 18:50:34 -08:00
Brady Wetherington acfb41f129 Remove 'actionlog' from the ::with() clause in the asset query API 2021-12-10 18:42:56 -08:00
snipe 5381aa3fbd Merge branch 'master' of https://github.com/snipe/snipe-it 2021-12-10 15:17:45 -08:00
snipe e20a10a6a1 Add @Haxatron as a contributor 2021-12-10 15:17:26 -08:00
snipe 949141a8e7
Merge pull request #10414 from snipe/added_model_to_accessory_report 
Added model number to accessory report
 2021-12-10 15:10:02 -08:00
snipe e1bf3b50f4 Added model number to accessory report 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-10 15:09:29 -08:00
snipe cf5e3da3a5
Merge pull request #10406 from Haxatron/fix-access-control 
security fix
 2021-12-09 11:23:35 -08:00
Haxatron 1699c09758
Update AssetModelsController.php 2021-12-09 21:42:18 +08:00
Haxatron 918e7c8dae
Fix access control - https://huntr.dev/bounties/19453ef1-4d77-4cff-b7e8-1bc8f3af0862/ 2021-12-09 12:57:04 +08:00
snipe 86afe6c4b1 Cleanup slack validation 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 18:03:56 -08:00
snipe ff97b359ad Removed form request on ajax, cleaned up some other things 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 17:58:46 -08:00
snipe 81b66d0039 Change validation failure to 422 to make it consistent with Laravel's default 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 17:54:35 -08:00
snipe 8fa690b635 Reverting form request because it doesn't seem to work (????!!) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 17:54:15 -08:00
snipe 8c1cd87831 Added slacksettingsrequest as use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 15:56:22 -08:00
snipe cde2bad297 Small mods to slack jquery 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 15:56:05 -08:00
snipe 80d36cd72b Added slack settings request 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-08 15:53:05 -08:00
snipe 713fbdc0a6
Merge pull request #10239 from Godmartinz/Adds-info-on-how-to-nullify-reorder-alerts 
adds info on how to nullify reorder alerts for consumables, component…
 2021-12-08 14:26:22 -08:00
snipe 6d84482104
Merge pull request #10388 from snipe/features/switch_to_dusk 
WIP - Fixing unit tests, switching to dusk
 2021-12-06 14:19:36 -08:00
snipe 0ba55e0eaf
Merge pull request #10393 from aranar-pro/fix/#10365-Total-Purchase 
Fixed #10365: Snipe-IT has a wrong total purchase cost when reaches m…
 2021-12-06 14:08:24 -08:00
snipe 4612b9e711
Merge pull request #10394 from snipe/fixes/add_stricter_validation_for_slack_hooks 
Adds stricter validation for slack hooks
 2021-12-06 11:41:11 -08:00
snipe ebdbc20740 Adds stricter validation for slack endpoints 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-06 11:40:24 -08:00
Andrew Roth d1d3b84f77 Fixed #10365: Snipe-IT has a wrong total purchase cost when reaches million. Fixed to remove multiple commas in +1M per item. 2021-12-06 13:06:23 -05:00
snipe 66ed311914 Fixed asset maintenances test 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 20:14:39 -08:00
snipe f334bf1058 Fixed notification tests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 20:01:03 -08:00
snipe 0104f35f31 Fixed Component Test, commented Consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 19:43:15 -08:00
snipe 222ee8e0bf Slight refactor on depreciation test 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 19:36:07 -08:00
snipe 0e3bafd5b4 Fixed depreciation tests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 19:19:42 -08:00
snipe 17bc562ac4 Commented out broken permissions and importer tests for now 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 19:19:35 -08:00
snipe 1e46fde5e2 Fixed status labels tests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 19:01:57 -08:00
snipe 872bd29cb3 Removed repetitive tests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 18:27:52 -08:00
snipe 21e2504f79 Trying unsuccessfully to get nested factories working 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 17:38:28 -08:00
snipe 3a1e2a56d6 Use the proper ID for status ID factory 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 17:38:06 -08:00
snipe 5a01fff79c Use the Setting model for basetest 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 17:37:51 -08:00
snipe 390e8a6cc3 Fixed company unit test 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 16:43:03 -08:00
snipe b0d2fc787a Fixed accessory test 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 16:33:16 -08:00
snipe 35ba28bff9 Continuing to refactor tests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 16:14:45 -08:00
snipe c2709be4a1 Removed pointless tests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 16:14:23 -08:00
snipe 00d2235610 Lowercase tests in composer.json per previous revert 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 15:12:47 -08:00
snipe 21575cf674 Lowercase tests dir 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 15:09:52 -08:00
snipe c949a1f5f2 renamed Tests to tests 2021-12-02 15:08:26 -08:00
snipe 9536f836f0 Beginning of CompanyTest fixes (not done yet) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 15:02:46 -08:00
snipe 064e0b7a1c Removed dd for debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 15:02:25 -08:00
snipe 37033fb2f7 Removed some defaul values to handle validation 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 15:02:11 -08:00
snipe 77d6649e38 One more case change because I have NOTHING else to do 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 14:26:31 -08:00
snipe f61f386f31 Fixed again because I suck 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 14:07:48 -08:00
snipe d20a0f7c6d Update composer autoload for test case case 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 14:05:35 -08:00
snipe 406aed6b07 Case sensitive dir stuff 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 14:03:32 -08:00
snipe 5555553307 renamed again for git to accept case 2021-12-02 14:02:16 -08:00
snipe 00b63fe7c7 Fixed category factory methods 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 13:40:16 -08:00