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 12 Packages Projects Releases Wiki Activity
6145 commits 101 branches 268 tags 288 MiB
Commit graph

6145 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe b5ddc637b8 Merge branch 'develop-v6-integration' of https://github.com/snipe/snipe-it into develop-v6-integration 2021-06-11 22:20:02 -07:00
snipe 7f74b65834
Merge pull request #9704 from uberbrady/develop-v6-integration 
Get it so that we can re-build assets.
 2021-06-11 22:19:51 -07:00
snipe 226b208f7c Reset handler to stock for now 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 22:19:10 -07:00
Brady Wetherington 5b42481d8f Get it so that we can re-build assets. 2021-06-11 21:54:29 -07:00
snipe c08f70b03c Restore exeption handler functionality 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 21:51:28 -07:00
snipe 9e0e952576 Updated composer 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 20:12:39 -07:00
snipe 1b70b533aa Merge branch 'develop-v6-integration' of https://github.com/snipe/snipe-it into develop-v6-integration 2021-06-11 19:41:57 -07:00
snipe b30bbe1740 Fixed more factories 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 19:41:20 -07:00
snipe b3e9c51584
Merge pull request #9703 from uberbrady/develop-v6-integration 
Remove barryvdh's laravel-cors for fruitcake's laravel-cors
 2021-06-11 19:25:11 -07:00
Brady Wetherington 0118ff8a78 Remove barryvdh's laravel-cors for fruitcake's laravel-cors 2021-06-11 19:12:43 -07:00
snipe b7f45d2ae2 Re-emable auth routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 19:02:25 -07:00
snipe fa786e615e Moved HasFactory 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 19:02:19 -07:00
snipe 2ed2007888
Merge pull request #9702 from uberbrady/develop-v6-integration 
Finished fixing the web routes file
 2021-06-11 17:15:35 -07:00
Brady Wetherington 42316f3ba7 Finished fixing the web routes file and put a gigantic warning in the api routes file 2021-06-11 17:12:06 -07:00
snipe ebfb3ed5b7
Merge pull request #9699 from uberbrady/develop-v6-integration 
Basic fixes to at least get the dashboard up
 2021-06-11 15:56:59 -07:00
Brady Wetherington fc5c0a0e95 Basic fixes to at least get the dashboard up 2021-06-11 15:23:44 -07:00
snipe 3095a78664 Small tweaks to Dashboard controller 
Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 14:43:47 -07:00
snipe 2cddd7faf0 Fixed filesystem config 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 14:26:10 -07:00
snipe a5f144b4e0 Merge branch 'shift-46327' into develop-v6-integration 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-06-11 14:10:10 -07:00
snipe a8123092af Misc fixes for shift 
// TODO - re-fix the exception handler

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 14:07:50 -07:00
snipe aae6a8fc6c Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-10 17:42:29 -07:00
snipe c567ad0617 Add @travismiller as a contributor 2021-06-10 15:18:02 -07:00
Laravel Shift b62d1f49e4 Shift cleanup 2021-06-10 20:19:27 +00:00
Laravel Shift 9838c0c2ef Upgrade to Laravel Mix 6 2021-06-10 20:18:15 +00:00
Laravel Shift 8b82262777 Shift return type of base TestCase methods 
From the [PHPUnit 8 release notes][1], the `TestCase` methods below now declare a `void` return type:

- `setUpBeforeClass()`
- `setUp()`
- `assertPreConditions()`
- `assertPostConditions()`
- `tearDown()`
- `tearDownAfterClass()`
- `onNotSuccessfulTest()`

[1]: https://phpunit.de/announcements/phpunit-8.html
 2021-06-10 20:18:12 +00:00
Laravel Shift 30607ac268 Shift Laravel dependencies 2021-06-10 20:18:11 +00:00
Laravel Shift 7e93086dd4 Default config files 
In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them and merged your true customizations -
where ENV variables may not be used.
 2021-06-10 20:18:10 +00:00
Laravel Shift cc3c59bf97 Shift config files 2021-06-10 20:18:10 +00:00
Laravel Shift c367fa7e40 Shift PSR-4 autoloading 2021-06-10 20:18:01 +00:00
Laravel Shift c90b1c6a43 Namespace seeders 2021-06-10 20:18:00 +00:00
Laravel Shift 104b441e0d Shift to class based factories 2021-06-10 20:17:44 +00:00
Laravel Shift c02a95e73f Ignore temporary framework files 2021-06-10 20:17:22 +00:00
Laravel Shift 3c40c6fe25 Shift console routes 2021-06-10 20:17:20 +00:00
Laravel Shift 9f43ce97e9 Convert deprecated $dates property to $casts 2021-06-10 20:17:18 +00:00
Laravel Shift bdf23e472e Shift to class based routes 2021-06-10 20:17:14 +00:00
Laravel Shift ddc8b8648b Shift service providers 2021-06-10 20:17:07 +00:00
Laravel Shift 4ed3d6afb8 Shift HTTP kernel and middleware 2021-06-10 20:17:04 +00:00
Laravel Shift ec0dc681ba Shift core files 2021-06-10 20:16:59 +00:00
Laravel Shift 802dc9240d Shift bindings 
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
 2021-06-10 20:16:56 +00:00
Laravel Shift 934afa036f Adopt Laravel coding style 
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.

You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
 2021-06-10 20:15:52 +00:00
snipe 54cb6c050a
Merge pull request #9679 from tulsaschoolsdata/serial-number-indexes 
Fixed #8486: Add index for asset serial number
 2021-06-09 17:36:06 -07:00
snipe 851e5ca96e
Merge pull request #9683 from tulsaschoolsdata/9682-company-id-indexes 
Thanks!
 2021-06-09 17:35:37 -07:00
Travis Miller 103c4325ce Fixed #9682: Add indexes for company_id 2021-06-09 14:29:00 -05:00
Travis Miller ebe7c2da87 Fixed #8486: Add index for asset serial number 2021-06-09 14:12:35 -05:00
snipe 6c1dd81e0a
Merge pull request #9640 from inietov/fixes/errorexception_invalid_argument_supplied 
Fixes an issue when tried to upload a file to an user without actually selecting a file. [ch16471]
 2021-05-27 14:03:25 -07:00
Ivan Nieto Vivanco 9f944ad497 Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471]. 2021-05-27 15:48:13 -05:00
snipe 7d5a9180e6 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:57:56 -07:00
snipe 9f2b4c721d Allow password reset from user profile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:32:23 -07:00
snipe 3d008079c9 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-05-26 14:32:33 -07:00
snipe b8d413a6b8
Merge pull request #9632 from inietov/fixes/api_allow_duplicate_asset_tags 
Fixes an issue that allows duplicate asset tags when the Asset is created via API.
 2021-05-26 13:34:59 -07:00