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

6163 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brady Wetherington ea1f1eb972 Get some basic Livewire going for 'edit model's default values. 2021-06-28 21:00:20 -07:00
Brady Wetherington 8e66abb926 Basic Laravel7 compatibility, starting getting Livewire going 2021-06-28 21:00:16 -07:00
Brady Wetherington 8268aca9fc Removed Ziggy.baseUrl references for meta references that had baseUrl 2021-06-23 19:57:45 -07:00
snipe d037ec5b9c Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 18:08:50 -07:00
snipe 2218155700 Remove phantomJS 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 18:04:00 -07:00
snipe 32a6fa5f0c Pushed less changes into integration branch 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 18:00:33 -07:00
snipe b3ec4bb31b Porting PR #9720 to v6 integration 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 14:28:06 -07:00
snipe 6e7ef585e4 Merge branch 'develop-v6-integration' of https://github.com/snipe/snipe-it into develop-v6-integration 2021-06-23 14:27:26 -07:00
snipe 58d674cca8
Merge pull request #9737 from uberbrady/develop-v6-integration 
Develop v6 integration
 2021-06-23 11:25:40 -07:00
Brady Wetherington 17aab61987 Some fixes to some typos in other routes, commeting out parameters parameter which seems crashy 2021-06-22 18:58:25 -07:00
Brady Wetherington 9456a03a88 Almost finished with the routes which is...hopefully? The last thing? 2021-06-22 16:58:23 -07:00
snipe dc157f8f78 Add components and users count to dashboard 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-19 16:16:18 -07:00
snipe 60538508d4 Added missing route 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-12 01:51:53 -07:00
snipe 17fb56d3b9 More updated routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-12 01:35:29 -07:00
snipe 346d879344 Updated routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-12 01:05:20 -07:00
snipe 14ac7a2181 Updated API routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-12 00:42:34 -07:00
snipe aebb30cea8 Fixed Cors wildcard 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-12 00:23:51 -07:00
snipe c407b52bbf Updated Cors 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-12 00:23:30 -07:00
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