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
6829 commits 101 branches 268 tags 288 MiB
Commit graph

219 commits

Author SHA1 Message Date
snipe db45de5da2 Fixed old style user routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:26:07 -08:00
snipe 207c785b1d Added missing use statements for Laravel 8 routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:20:10 -08:00
snipe 8a747be3a0 Fixed routes for newer format (l8) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:16:40 -08:00
snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
 2021-11-15 19:24:38 -08:00
snipe 542ab75d89 Added new backup routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-09 19:39:50 -08:00
snipe edf98cb795
Merge pull request #10279 from snipe/fixes/turn_get_into_post_for_custom_field_required 
Turn custom fields required/optional/remove into POST requests
 2021-11-08 14:37:36 -08:00
snipe b5855e7be5 Removed get route for logout 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-08 12:35:15 -08:00
snipe 0d811d067c Turn cusotm fields required/optional/remove into POST requests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-05 10:53:48 -07:00
snipe aa8f1378c9 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Http/Controllers/Accessories/AccessoriesController.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Assets/BulkAssetsController.php
#	app/Http/Controllers/Components/ComponentsController.php
#	app/Http/Controllers/Consumables/ConsumablesController.php
#	app/Http/Controllers/Licenses/LicenseFilesController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/UserFilesController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Http/Transformers/LicensesTransformer.php
#	app/Importer/UserImporter.php
#	app/Models/Asset.php
#	config/app.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/en/admin/users/message.php
#	resources/lang/is/button.php
#	resources/lang/ja/admin/kits/general.php
#	resources/lang/ro/admin/users/general.php
#	resources/lang/zh-HK/admin/depreciations/general.php
#	resources/lang/zh-HK/admin/models/general.php
#	resources/views/hardware/qr-view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/users/view.blade.php
#	routes/web.php
#	routes/web/hardware.php
#	routes/web/models.php
#	routes/web/users.php
 2021-10-20 17:26:41 -07:00
Dampfklon ab4a234e20 fix rebase errors 2021-10-07 21:32:57 +02:00
Dampfklon 4418ad2340 Enable display of deleted acceptances, strike deleted users, add date, enable sorting 2021-10-07 21:03:46 +02:00
Dampfklon 12ee06deb6 add Download All Button, change route analogue to activity report 2021-10-07 21:01:50 +02:00
Dampfklon ed99532c30 Unaccepted Assets Report Actions (send reminder, delete) added 
Unaccepted Assets Export fixed
 2021-10-07 20:53:02 +02:00
Brady Wetherington d80604f2ac Most of the basics are working, but not done and lots of debug messages are about 
I picked up the change that picked a point-release difference on the AWS library since that usually
works out for us (x.y.1 vs. x.y.2 - usually a good call)
 2021-10-04 22:06:48 -07:00
snipe caad5be957 Updated routes to use POST for restore 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 17:17:36 -07:00
snipe 03e3c21d7e
Merge pull request #10129 from snipe/features/improved_mobile_ux 
Features/improved mobile ux
 2021-09-24 12:30:56 -07:00
Ivan Nieto Vivanco efc9a8e2c9 Fixes route not defined exception on components and consumables 2021-09-24 11:38:07 -05:00
snipe c69a883409 Fixed Groups route 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 04:12:07 -07:00
snipe 1574d24dde Fixed accessories route 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 04:11:58 -07:00
snipe 1ecd11dd2e More route fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-23 21:46:17 -07:00
snipe 61cf9ec009 Small conflict handling bits 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-22 00:00:44 -07:00
Delta5 59302e1d19 Add restore to users api endpoint 2021-09-21 17:42:26 +00:00
snipe 67357e07f1 Added API route for depreciations report 
RED FLAG: This will need to be updated for v6!!!!

Signed-off-by: snipe <snipe@snipe.net>
 2021-09-01 17:05:00 -07:00
snipe 193a52876e Fix incorrect resource route name 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 15:01:10 -07:00
snipe 45caa8a90d Added restore functionalty to asset API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-14 14:06:15 -07:00
snipe 8ea3acc943 Fixed route ordering (FIFO) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-08 16:05:07 -07:00
snipe 868419b35b Components checkin/checkout via API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-30 01:02:44 -07:00
snipe df7e0e5630 Fixed company resource route 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-29 23:46:25 -07:00
snipe 533c3f1651 Fixed incorrect resource route 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-29 20:58:04 -07:00
snipe 7af4c3a15f Fixed incorrect maintenances route 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 21:06:19 -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 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 b7f45d2ae2 Re-emable auth routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 19:02:25 -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
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 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
Laravel Shift b62d1f49e4 Shift cleanup 2021-06-10 20:19:27 +00:00
Laravel Shift 3c40c6fe25 Shift console routes 2021-06-10 20:17:20 +00:00
Laravel Shift bdf23e472e Shift to class based routes 2021-06-10 20:17:14 +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 9f2b4c721d Allow password reset from user profile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:32:23 -07:00
snipe b9bab05ac3 Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/users/print.blade.php
 2021-04-05 20:55:49 -07:00
Marc Leuser 90b7d34c69
Added #6695: add API endpoint for license seats (#8058) 
* remove miselading comment line

* added dedicated API endpoint for license seats

* don't display a seat name via API
it makes no sense and we don't have any particular sorting order
so the numbering would be inconsistent anyway

* reduce amount of IFs

* add sanity checks to show()

* fix goofed logging logic

* add tests for action log entries
 2021-03-29 19:41:26 -07:00
Vincent Lainé d6ead5ae17
Added #8931: add health controller without session (#8978) 
* Added health controller

* Trying to move session middleware to web and api group to have health controller without session

* Fix health route store the session

Co-authored-by: Vincent Lainé <v.laine@dental-monitoring.com>
 2021-01-26 12:10:54 -08:00
snipe 81bf41a091 Added an explanation for folks trying to access the API base endpoint with no real endpoint 2020-12-08 21:05:01 -08:00