snipe
|
066e5588b5
|
Fixed slugging in custom fields to no longer use old library
|
2020-04-21 04:14:23 -07:00 |
|
|
snipe
|
c17106d1b3
|
Fixes for settings controller
|
2020-04-21 04:08:25 -07:00 |
|
|
snipe
|
cb71bcc4af
|
Switch to old() helper
|
2020-04-21 03:58:31 -07:00 |
|
|
snipe
|
58f6b2da5a
|
Fixing assets
|
2020-04-21 03:42:35 -07:00 |
|
|
snipe
|
b670371e0b
|
Ugggh… fixing a donked merge
|
2020-04-21 03:30:21 -07:00 |
|
|
snipe
|
f532e9b462
|
Fixing assets :(
Not sure what happened in tbis merge exactly
|
2020-04-21 03:07:11 -07:00 |
|
|
snipe
|
3cb4672ffe
|
Updated composer
|
2020-04-21 02:47:12 -07:00 |
|
|
snipe
|
87464e6ec0
|
Merge branch 'develop' into integrations/2020-04-15-v5-merge
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
|
2020-04-20 23:20:34 -07:00 |
|
|
snipe
|
154db9a416
|
This literally never fucking worked. Ever. Shoot me.
|
2020-04-09 22:20:05 -07:00 |
|
|
snipe
|
cf9d0201e0
|
Catch weird edge case where target wouldn’t have an ID (?!)
|
2020-04-09 20:23:02 -07:00 |
|
|
snipe
|
7ebd21bc04
|
Added sr-only to the unstyles image upload button
|
2020-04-09 19:29:16 -07:00 |
|
|
snipe
|
5707df0239
|
Check that location isset in checkout
|
2020-04-09 18:32:34 -07:00 |
|
|
snipe
|
197a84be94
|
Commented out rtd_location_id override - why did we do that?
|
2020-04-09 14:17:39 -07:00 |
|
|
snipe
|
b4fa4c77d7
|
Check for rtd_location_id before trying to assign
|
2020-04-09 14:14:30 -07:00 |
|
|
snipe
|
cfec142c3b
|
Better handle models without a fieldset in the asset request [RB 9935]
|
2020-04-09 11:18:54 -07:00 |
|
|
snipe
|
48dfc699d7
|
Bumped version
|
2020-04-09 10:49:50 -07:00 |
|
|
snipe
|
ec723a3da1
|
Changed LDAP messaging
|
2020-04-09 10:37:51 -07:00 |
|
|
snipe
|
f8a72db696
|
Changed LDAP 600 to 500, clearer error messages on LDAP test
|
2020-04-09 09:55:44 -07:00 |
|
|
snipe
|
83ee64f155
|
Added missing CSS class to text-only logo
|
2020-04-08 17:25:14 -07:00 |
|
|
snipe
|
b7d12ff944
|
Changed placeholder text back to lighter grey - it was confusing when darker
|
2020-04-08 17:24:59 -07:00 |
|
|
snipe
|
0858fec7f1
|
Fixed CSS issue where text-only logos at the top would be the wrong color
|
2020-04-08 17:24:38 -07:00 |
|
|
snipe
|
206bd675f2
|
Pulled slack validation out of setting model validation so it doesn’t fail mysteriously on other pages
|
2020-04-08 15:07:02 -07:00 |
|
|
snipe
|
92695782ff
|
Add @anthonypburns as a contributor
|
2020-04-08 11:48:18 -07:00 |
|
|
snipe
|
c447e4d29b
|
Add @joshi-redbridge as a contributor
|
2020-04-08 11:48:03 -07:00 |
|
|
snipe
|
811f89b1de
|
Add @JoKneeMo as a contributor
|
2020-04-08 11:47:37 -07:00 |
|
|
snipe
|
be3e572440
|
Bumped version
|
2020-04-08 11:24:30 -07:00 |
|
|
snipe
|
824ebc19c0
|
Updated assets
|
2020-04-08 11:24:17 -07:00 |
|
|
snipe
|
a0f7fdc57a
|
Merge branch 'fixes/accessibility_fixes'
# Conflicts:
# public/css/build/all.css
# public/css/dist/all.css
# 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
|
2020-04-08 11:19:42 -07:00 |
|
|
snipe
|
450c1b9d56
|
Updated faker library to be compatible with PHP 7.4
|
2020-04-08 11:13:15 -07:00 |
|
|
snipe
|
79232fc434
|
Fixed #7947 - Added rtd_location_id to API search
|
2020-04-08 11:00:04 -07:00 |
|
|
snipe
|
0b3f511534
|
Fixed compact() errors
|
2020-04-07 17:26:56 -07:00 |
|
|
snipe
|
7f18983a49
|
Update local instance of composer.phar on upgrade. (#7940)
Co-authored-by: Johnny Moore <jmoore@eventide.com>
|
2020-04-07 13:21:55 -07:00 |
|
|
snipe
|
b7d9790acb
|
Fixed color style for btn-sm.btn-warning and btn-sm.btn-danger
|
2020-04-06 21:59:30 -07:00 |
|
|
snipe
|
1a5785a8d3
|
Fixed dashboard header size
|
2020-04-06 21:30:28 -07:00 |
|
|
snipe
|
320d660e83
|
Updated chartjs
|
2020-04-06 21:17:26 -07:00 |
|
|
snipe
|
fb903b2fda
|
Added comments, better indenting
|
2020-04-06 21:05:42 -07:00 |
|
|
snipe
|
c18646d096
|
Yellow highlight on selected rows
|
2020-04-06 21:00:11 -07:00 |
|
|
snipe
|
7bf398aca4
|
More settings filter fixes
|
2020-04-06 20:47:05 -07:00 |
|
|
snipe
|
f6bb655383
|
Prevent form submission
|
2020-04-06 20:17:44 -07:00 |
|
|
snipe
|
19f71face9
|
Added filtering to settings page
|
2020-04-06 20:11:13 -07:00 |
|
|
snipe
|
d82b94e281
|
Pull blue stylesheet if no skin was selected
|
2020-04-06 19:04:49 -07:00 |
|
|
snipe
|
893944403e
|
Check for location_id being set before trying to set it on checkout via API
|
2020-04-06 15:54:40 -07:00 |
|
|
snipe
|
0d3c18d1df
|
Fixed importer vue code for niceer layout
|
2020-04-06 15:09:37 -07:00 |
|
|
snipe
|
d7873f257d
|
Fixed CSP for importer
|
2020-04-06 14:18:45 -07:00 |
|
Johnny Moore
|
7e3f718797
|
Update local instance of composer.phar on upgrade.
|
2020-04-03 13:13:30 -04:00 |
|
|
snipe
|
be79a1f3d6
|
Bumped hash
|
2020-04-02 19:27:41 -07:00 |
|
|
snipe
|
a8032ac388
|
Switched to btn-primary for submit
|
2020-04-02 18:38:54 -07:00 |
|
|
snipe
|
21d8225696
|
Use button primary for higher contrast
|
2020-04-02 18:33:26 -07:00 |
|
|
snipe
|
766c2b22cb
|
Removed stray tag
|
2020-04-02 18:33:10 -07:00 |
|
|
snipe
|
db79f92423
|
Updatedb select2 to latest for aria fixes
|
2020-04-02 18:22:25 -07:00 |
|