snipe
c3d55ee27e
Merge master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Models/Setting.php
# config/version.php
# resources/lang/af/button.php
# resources/lang/ar/button.php
# resources/lang/bg/button.php
# resources/lang/cs/button.php
# resources/lang/cy/button.php
# resources/lang/da/button.php
# resources/lang/de/button.php
# resources/lang/el/button.php
# resources/lang/en-GB/button.php
# resources/lang/en-ID/button.php
# resources/lang/es-CO/admin/groups/message.php
# resources/lang/es-MX/button.php
# resources/lang/et/admin/custom_fields/general.php
# resources/lang/et/admin/hardware/table.php
# resources/lang/et/admin/kits/general.php
# resources/lang/et/admin/manufacturers/message.php
# resources/lang/et/admin/models/general.php
# resources/lang/et/admin/settings/general.php
# resources/lang/et/button.php
# resources/lang/et/mail.php
# resources/lang/fa/button.php
# resources/lang/fa/help.php
# resources/lang/fi/button.php
# resources/lang/fil/button.php
# resources/lang/fr/button.php
# resources/lang/ga-IE/button.php
# resources/lang/he/button.php
# resources/lang/hr/button.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/auth/message.php
# resources/lang/hu/button.php
# resources/lang/hu/mail.php
# resources/lang/id/admin/hardware/table.php
# resources/lang/id/button.php
# resources/lang/it/button.php
# resources/lang/iu/button.php
# resources/lang/ja/button.php
# resources/lang/ko/button.php
# resources/lang/lt/button.php
# resources/lang/lv/button.php
# resources/lang/mi/button.php
# resources/lang/mk/button.php
# resources/lang/ml-IN/button.php
# resources/lang/mn/button.php
# resources/lang/ms/admin/hardware/table.php
# resources/lang/ms/admin/kits/general.php
# resources/lang/ms/admin/models/general.php
# resources/lang/ms/admin/models/message.php
# resources/lang/ms/admin/settings/general.php
# resources/lang/ms/button.php
# resources/lang/nl/button.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/auth/message.php
# resources/lang/no/button.php
# resources/lang/no/help.php
# resources/lang/no/mail.php
# resources/lang/pl/button.php
# resources/lang/pt-BR/button.php
# resources/lang/pt-PT/auth/message.php
# resources/lang/pt-PT/button.php
# resources/lang/pt-PT/mail.php
# resources/lang/ro/button.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/help.php
# resources/lang/sl/admin/custom_fields/general.php
# resources/lang/sl/admin/hardware/table.php
# resources/lang/sl/admin/kits/general.php
# resources/lang/sl/admin/manufacturers/message.php
# resources/lang/sl/admin/models/general.php
# resources/lang/sl/admin/settings/general.php
# resources/lang/sl/admin/users/general.php
# resources/lang/sl/auth/message.php
# resources/lang/sl/button.php
# resources/lang/sl/help.php
# resources/lang/sr-CS/button.php
# resources/lang/ta/button.php
# resources/lang/th/button.php
# resources/lang/th/mail.php
# resources/lang/tl/button.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/auth/message.php
# resources/lang/tr/button.php
# resources/lang/uk/button.php
# resources/lang/ur-PK/button.php
# resources/lang/vi/button.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-HK/button.php
# resources/lang/zh-TW/admin/hardware/table.php
# resources/lang/zh-TW/button.php
# resources/lang/zu/button.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/slack.blade.php
2021-12-16 14:26:24 -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
80d36cd72b
Added slack settings request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 15:53:05 -08:00
snipe
3b25093aeb
Removed noisy debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-09 22:38:27 -08:00
snipe
76506dabbf
Made helpers call full namespace (tho I have no idea why this was necessary)
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-09 22:38:14 -08:00
snipe
61f16f47a2
Use Helper alias
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 19:44:55 -07:00
snipe
e27065fe16
Merge branch 'develop-v6-integration' into develop-v6-rc1
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
2021-09-21 23:46:50 -07:00
Petri Asikainen
89cc84f1d9
convert image_source field
...
This reverts commit b2d3ba7410
2021-07-15 12:26:14 +03:00
Petri Asikainen
f24138da44
Revert "Handle image_source with ConvertBase64ToFiles"
...
This reverts commit 168d7f7004
2021-07-15 12:26:14 +03:00
Petri Asikainen
a76b36cad9
Handle image_source with ConvertBase64ToFiles
2021-07-15 12:26:14 +03:00
Petri Asikainen
5f81488679
fix debug placement
2021-07-15 12:26:14 +03:00
Petri Asikainen
c894e8ceb3
handle files via standard field
2021-07-15 12:26:14 +03:00
Petri Asikainen
bbe964c6b2
debug trait
2021-07-15 12:26:14 +03:00
Petri Asikainen
2325b1d8c2
Try without trait
2021-07-15 12:26:14 +03:00
Petri Asikainen
d7d3681d71
trait base64 encoded files
2021-07-15 12:26:13 +03:00
Petri Asikainen
7a424649c8
convert image_source field
...
This reverts commit b2d3ba7410
2021-07-07 09:24:24 +03:00
Petri Asikainen
b2d3ba7410
Revert "Handle image_source with ConvertBase64ToFiles"
...
This reverts commit 168d7f7004
2021-07-07 09:20:38 +03:00
Petri Asikainen
168d7f7004
Handle image_source with ConvertBase64ToFiles
2021-07-07 09:08:37 +03:00
Petri Asikainen
e3166c2209
fix debug placement
2021-07-06 06:41:37 +03:00
Petri Asikainen
d66ef233bf
handle files via standard field
2021-07-06 06:25:37 +03:00
Petri Asikainen
013df747d7
debug trait
2021-07-05 09:59:19 +03:00
Petri Asikainen
02fb7ac03e
Try without trait
2021-07-04 13:39:46 +03:00
Petri Asikainen
d48a9d549d
Try without trait
2021-07-04 13:37:05 +03:00
Petri Asikainen
f4fa6836cb
trait base64 encoded files
2021-07-02 10:29:26 +03:00
Petri Asikainen
e846e6ac76
trait base64 encoded files
2021-07-02 10:18:18 +03:00
Laravel Shift
b62d1f49e4
Shift cleanup
2021-06-10 20:19:27 +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
1a7edb3411
Accept webp in uploads (not just image files)
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-21 16:56:11 -07:00
snipe
e1c6d4ced7
Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Requests/SettingsSamlRequest.php
2021-04-14 15:15:07 -07:00
snipe
3ffa3534a0
Use environmental variables in memory limits
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-05 21:47:57 -07:00
snipe
45bfec5cd3
Match setup admin on Quickstart password with min reqs for Settings model
2020-12-11 13:52:48 -08:00
snipe
4ac15daee7
Fixed #8147 - allow webp image format for public file uploads
2020-12-01 19:06:53 -08:00
johnson-yi
0cdd83aabf
Fixes #8584 , #8654 , #8727 - fixes and improvements for saml ( #8795 )
...
* Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy
* Gracefully handle the case where openssl_csr_new fails when openssl.cnf is invalid/missing
* Improve ui of saml sp metadata by displaying it's url and a download button
2020-11-20 18:54:25 -08:00
NMC
402fecd408
Fixed #7850 : allow xlsx file. ( #8386 )
...
Thanks!
2020-11-16 21:32:15 -08:00
snipe
fbaf6e2494
Fixed #8747 - upload path for uploaded images
2020-11-16 16:39:02 -08:00
snipe
9db191f0b2
Fixes for #8732 - Flysystem paths, migrator script
2020-11-12 21:46:06 -08:00
snipe
d03d4deef9
Temp fix for #8561 - manager_id validation error
2020-10-23 11:55:53 -07:00
snipe
a86dc52695
Added fieldname to file name for better clarity on setting logos
2020-08-26 12:17:36 -07:00
snipe
d25a05d748
Misc Flysystem/image upload request fixes
2020-08-26 11:53:36 -07:00
snipe
139c874308
Fixed delete old image on upload
2020-08-26 02:48:07 -07:00
snipe
f385f3e928
Fixed user image upload
...
TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images
2020-08-26 02:30:23 -07:00
snipe
66686f8080
Added some debugging - will remove at RC
2020-08-24 18:32:15 -07:00
Michael Pietsch
4f5374b2e8
enable use custom file based saml certificate/private key
2020-08-14 12:25:00 +02:00
snipe
6a089f86f8
Fixed pathing for accessories
2020-08-03 11:17:56 -07:00
snipe
a7eb89f6b6
Misc fixes for flysystem paths
2020-06-16 16:06:25 -07:00
Daniel Meltzer
b3fe47bfa7
Remove/Reorganize logic to make codacy happier.
2020-05-23 15:24:10 -04:00
Johnson Yi
c1c37d521c
Allow downloading sp metadata without idp
2020-05-06 19:50:50 +10:00
Johnson Yi
b2930d6069
Added #542 : add saml authentication
2020-05-06 00:06:19 +10:00
Daniel Meltzer
f8d18a8eb0
Revert asset-checkout-different validation.
...
This was causing issues when trying to check an item out to a user or a
location because of the way laravel handles validation.
Instead, rely on the exception check we had in the controller. I moved
this exception up to the model checkout method so that it would work
for anywhere that that method was called, even if it avoided the
controller.
2020-04-29 10:59:00 -04:00
snipe
29b05d2020
Fixed syntax error in image upload request from mangled merge
2020-04-21 06:29:57 -07:00
