snipe
|
e321aeabae
|
Merge branch 'master' into integrations/2020-08-31-v5-rc
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/Loggable.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# 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/assets/less/overrides.less
# resources/macros/macros.php
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/labels.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# routes/web/fields.php
# tests/unit/UserTest.php
|
2020-08-31 12:14:44 -07:00 |
|
|
snipe
|
5bb4f271aa
|
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-24 00:47:19 -07:00 |
|
|
snipe
|
bea3a7b982
|
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-24 00:39:32 -07:00 |
|
|
snipe
|
793d9e9250
|
Fixed routes that didn’t have auth requirement
|
2017-03-11 05:16:56 -08:00 |
|
|
snipe
|
b1a80f8ed8
|
Fixes #1684 - Allow editing of custom fields
@uberbrady can finally get out of the sea
|
2017-01-25 04:34:11 -08:00 |
|
|
snipe
|
e685e0f019
|
Cleaned up custom fields controllers, views, names, etc
|
2016-12-15 19:17:07 -08:00 |
|