Brady Wetherington
d2b7828569
This is a squashed branch of all of the various commits that make up the new HasCustomFields trait.
...
This should allow us to add custom fields to just about anything we want to within Snipe-IT.
Below are the commits that have been squashed together:
Initial decoupling of custom field behavior from Assets for re-use
Add new DB columns to Custom Fields and fieldsets for 'type'
WIP: trying to figure out UI for custom fields for things other than Assets, find problematic places
Real progress towards getting to where this stuff might actually work...
Fix the table-name determining code for Custom Fields
Getting it closer to where Assets at least work
Rename the trait to it's new, even better name
Solid progress on the new Trait!
WIP: HasCustomFields, still working some stuff out
Got some basics working; creating custom fields and stuff
HasCustomFields now validates and saves
Starting to yank the other boilerplate code as things start to work (!)
Got the start of defaultValuesForCustomField() working
More progress (squash me!)
Add migrations for default_values_for_custom_fields table
WIP: more towards hasCustomFields trait
Progress cleaning up the PR, fixing FIXME's
New, passing HasCustomFieldsTrait test!
Fix date formatter helper for custom fields
Fixed more FIXME's
2024-06-06 13:35:38 +01:00
Brady Wetherington
645bba96cd
WIP: First stabs at getting Laravel Vite to work; no luck so far :(
...
Probably going to back out all the 'vite' stuff anyways :/
2023-02-21 19:35:37 -08: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
Folke Ashberg
1687e4b850
Fix for Issue #8543
...
* trustedproxy.php sets 'proxies' again according to
env('APP_TRUSTED_PROXIES') again
2020-10-21 10:36:27 +02:00
snipe
533649f24e
Merge branch 'develop' into dev-master-integration
...
# Conflicts:
# .gitignore
# .travis.yml
# app/Console/Commands/LdapSync.php
# app/Console/Commands/SendExpectedCheckinAlerts.php
# app/Console/Commands/SendExpirationAlerts.php
# app/Console/Commands/SendInventoryAlerts.php
# app/Console/Kernel.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/Auth/ResetPasswordController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/UsersController.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/Importer.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/License.php
# app/Models/Location.php
# app/Models/Recipients/AlertRecipient.php
# app/Models/User.php
# app/Providers/AppServiceProvider.php
# composer.json
# composer.lock
# config/trustedproxy.php
# config/version.php
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/lang/ar/admin/settings/general.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/passwords.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/passwords.php
# resources/lang/es-ES/passwords.php
# resources/lang/es-MX/passwords.php
# resources/lang/es-VE/passwords.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/id/admin/settings/general.php
# resources/lang/id/passwords.php
# resources/lang/ja/passwords.php
# resources/lang/nl/passwords.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/passwords.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/passwords.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/admin/statuslabels/table.php
# resources/lang/ru/passwords.php
# resources/lang/sr-CS/general.php
# resources/lang/sr-CS/mail.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/passwords.php
# resources/lang/vi/admin/models/message.php
# resources/lang/vi/admin/users/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/views/importer/import.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/view.blade.php
# tests/unit/ImporterTest.php
2019-02-13 06:42:52 -08:00
snipe
db385e024b
Possible proxy issue fix
2018-10-03 13:04:25 -07:00
snipe
60c4fa1d90
Updated trustedproxy w/config
2018-07-24 21:13:02 -07:00
snipe
95d935d917
Added warning to not edit config files manually
2018-03-07 17:39:13 -08:00
snipe
8ba19aa855
Fixes explode for trusted proxy
2017-04-27 07:09:23 -07:00
snipe
e54036991c
Updated trusted proxy config for newer version
2017-01-13 20:59:54 -08:00
Nikolai Prokoschenko
8d03668d78
Fix reverse proxy support
...
Reintroducing trusted proxies via fideloper/proxy:
* Upgraded fideloper/proxy to 3.1
* Added fideloper/proxy to Http/Kernel.php
* Added fideloper/proxy to config/app.php
* Added environment variable APP_TRUSTED_PROXIES to env (with '*' being the default fallback)
2016-06-16 15:43:42 +02:00