DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 12:04:21 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10373 commits 97 branches 267 tags 296 MiB
Commit graph

10373 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Nieto Vivanco 0df9dd8320 Delete a function that is not longer used 2022-03-01 18:59:50 -06:00
snipe 2eef43e8bf
Applies develop fix to master for location drop downs 2022-03-01 12:43:35 -08:00
snipe 5d1cd89838
Merge pull request #10751 from aranar-pro/bug_fix/location-drop-down-#10701 
Fix for location and model drop down with granular permissions.
 2022-02-28 16:33:12 -08:00
Andrew Roth 74248a4314 removing composer.lock from PR 2022-02-28 19:30:32 -05:00
Andrew Roth 2e60420aeb Fix for location and model drop down with granular permissions. 2022-02-28 17:38:38 -05:00
Jens Maes 9b88f650d2 Prevents showing double values 
- If the asset name and tag are the same, the tag does not get shown in an email.
- If the model name is the same as the model number (when importing from LanSweeper for example), do not show the model number.
 2022-02-25 08:19:46 +01:00
snipe 336d8e6574
Updated version 2022-02-24 18:17:15 -08:00
Godfrey M 533670f3f1 faulty method for converting asset acceptance to pdf 2022-02-24 14:50:16 -08:00
snipe a5c16c6a9c Update @insert-waffle as a contributor 2022-02-24 14:47:48 -08:00
snipe 1ee37212f1 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2022-02-24 14:47:14 -08:00
snipe ed43d36895 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 14:47:09 -08:00
snipe d243b822e7
Merge pull request #10729 from insert-waffle/fix-10708 
Fixes 10708: removed line height of manufacturer and changed size of fa-hdd to 2x
 2022-02-24 14:46:51 -08:00
snipe dfbff27483 Updated sample CSVs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 14:19:35 -08:00
snipe 24ce34c8d7 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 14:19:27 -08:00
snipe 7abb1f960c Merge branch 'master' of https://github.com/snipe/snipe-it 2022-02-24 14:16:00 -08:00
snipe ec7df11d73
Merge pull request #10736 from inietov/fixes/imported_assets_duplicate_model_notes_from_assets_master 
Separate notes on assets and asset models on master branch [sc-18810]
 2022-02-24 14:15:48 -08:00
snipe f077d096e2
Merge pull request #10735 from inietov/fixes/imported_assets_duplicate_model_notes_from_assets 
Separate notes on assets and asset models [sc-18810]
 2022-02-24 14:15:13 -08:00
Ivan Nieto Vivanco 64fa7e23fc Separate notes on assets and asset models 2022-02-24 16:05:03 -06:00
snipe 93ad59466b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 13:52:33 -08:00
Ivan Nieto Vivanco 577dc6b02c Separate notes on assets and asset models 2022-02-24 15:50:59 -06:00
snipe 4b7f45a15e
Merge pull request #10734 from snipe/fixes/api_throttling 
Fixed API throttling
 2022-02-24 13:43:49 -08:00
snipe 83f21d0ddf Added a comment about why we use the middleware there 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 13:41:16 -08:00
snipe 2906a89442 Make the 429 error less stupid 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 13:10:34 -08:00
snipe 50f55b4308 Fixes broken API throttling 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 13:10:10 -08:00
Jens Maes 57e93e4e92 Fixes 10708: change size of fa-hdd to 2x 2022-02-24 11:05:40 +01:00
Jens Maes c0893c44a3 Fixes 10708: Removed line heigt from manufacturer list item. 2022-02-24 10:29:39 +01:00
snipe a8028e7dd0
Merge pull request #10727 from uberbrady/master 
Fix for negative CORS/SAML interaction
 2022-02-23 11:17:17 -08:00
Brady Wetherington 15abc84ab0 Migrate to Fruitcake/laravel-cors which has path-exclusion built-in 2022-02-23 11:06:19 -08:00
snipe 8a09211310
Merge pull request #10722 from snipe/features/add_force_saml_to_master 
Fixes Restricted Logins to SAML controlled via environment variable #10436 - applies #10449 to master
 2022-02-22 21:45:19 -08:00
snipe 42fcd29200 Fixed #10436 on master, applies #10449 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-22 21:06:54 -08:00
snipe dc2e6c2b06 Adds consumables endpoint to user API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-22 20:44:34 -08:00
snipe 0cfc0a4bee
Merge pull request #10718 from uberbrady/fix_cors_option_1_master 
Fix CORS requests on master (option *ONE*)
 2022-02-22 19:24:18 -08:00
snipe 292bf21e7d
Merge pull request #10720 from uberbrady/fix_cors_develop 
Fix cors develop
 2022-02-22 19:23:43 -08:00
Brady Wetherington 294606fb0b Move new CORS library to global middleware, the only place it works 2022-02-22 19:07:23 -08:00
Brady Wetherington cd2c92fd6c Cors should respect the .env var for CORS domains 2022-02-22 19:00:59 -08:00
Brady Wetherington 64f83f9a5f Move HandleCors middleware to be universal 2022-02-22 17:43:40 -08:00
snipe 6ef053bc52
Merge pull request #10713 from snipe/fixes/error_handler 
Added use statement
 2022-02-22 10:46:58 -08:00
snipe 0a4a548f9c Added use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-22 10:46:02 -08:00
snipe 784bf6f223 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-20 13:30:24 -08:00
snipe dd5f812d88 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Console/Commands/FixDoubleEscape.php
#	app/Console/Commands/LdapSync.php
#	app/Exceptions/Handler.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/CategoriesController.php
#	app/Http/Controllers/Api/CompaniesController.php
#	app/Http/Controllers/Api/DepartmentsController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/SuppliersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Models/Loggable.php
#	app/Providers/AuthServiceProvider.php
#	config/version.php
#	database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
#	database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
#	package-lock.json
#	package.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
#	resources/views/hardware/view.blade.php
 2022-02-20 13:29:12 -08:00
snipe cbfb8283f3 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2022-02-20 11:29:55 -08:00
snipe dc2b58f865
Merge pull request #10691 from snipe/fixes/update_audit_date_when_settings_update 
Fixed #10690 - Initial audit date fix
 2022-02-20 11:16:54 -08:00
snipe 34ebc629c2 Remove unusued translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-20 11:15:56 -08:00
snipe 21a6bdabc6 Add @insert-waffle as a contributor 2022-02-20 11:12:52 -08:00
snipe eaf4fefc90
Merge pull request #10700 from insert-waffle/develop 
Fixes #10699: Added 2 breaks in message.blade.php
 2022-02-20 11:12:20 -08:00
snipe 19b25a39ea
Merge pull request #10697 from inietov/features/save_loggedin_user_after_restore 
Feature Save logged in user data and re-add them after restore if they don't exist [ch-17664]
 2022-02-20 11:11:54 -08:00
Jens Maes e5f6b48115 🧑‍🔧 Added 2 breaks in message.blade.php 
The uploaded logo does not align properly, therefor I added 2 breaks which make sure the site title is BELOW the logo and not next to it.
 2022-02-18 10:27:12 +01:00
Ivan Nieto Vivanco f1ba5c7742 Changed the warning message in the Backups page 2022-02-17 22:47:35 -06:00
Ivan Nieto Vivanco 23a6907975 Some minor stylistic changes 2022-02-17 18:05:06 -06:00
Ivan Nieto Vivanco 5b2a5ff124 Put the 'remember_token' column as null in the users table 2022-02-17 18:03:00 -06:00