snipe
|
94e8343f63
|
Generated skins in css/dist/skins
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 07:13:09 -07:00 |
|
|
snipe
|
cdd0e405be
|
Fixed weird merge
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 07:12:29 -07:00 |
|
|
snipe
|
eb8c20880a
|
Updated package.json
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 07:12:12 -07:00 |
|
|
snipe
|
af6dc0068b
|
Updated node, set min requirement
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 07:12:00 -07:00 |
|
|
snipe
|
a160da6619
|
Removed unused styles
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 07:11:38 -07:00 |
|
|
snipe
|
3435485a46
|
Updated path to skin css
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 06:41:19 -07:00 |
|
|
snipe
|
3a446e6396
|
Updated variables.less with additional values
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 06:40:27 -07:00 |
|
|
snipe
|
b725e788ec
|
Applied new selectlist search to locations
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 06:39:41 -07:00 |
|
|
snipe
|
fa5134603f
|
Added type casting and a few more validation rules
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 06:37:40 -07:00 |
|
|
snipe
|
a44d1cc0cf
|
Fixed iCheck
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 06:02:55 -07:00 |
|
|
snipe
|
69a1732245
|
Removed duplicate form request in asset models controller
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 03:51:10 -07:00 |
|
|
snipe
|
7e9e5214ef
|
Fixed status label create error
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 03:50:43 -07:00 |
|
|
snipe
|
e1784394b3
|
Moved js, skins and primary CSS into dist directory
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 03:39:42 -07:00 |
|
|
snipe
|
edc29bf6d5
|
Moved font-awesome fonts to make life easier
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 03:33:14 -07:00 |
|
|
snipe
|
6103524ebc
|
Moved skins into css/dist directory
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 03:32:52 -07:00 |
|
|
snipe
|
2db527f4d2
|
Removed CSS skins (these are generated in the css dir)
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 03:27:51 -07:00 |
|
|
snipe
|
60851c2eb2
|
Fixed AssetsController namespace in route
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 03:15:54 -07:00 |
|
|
snipe
|
905fb09c5b
|
Removed unused light skins
|
2020-04-22 01:56:22 -07:00 |
|
|
snipe
|
82b6d2b31b
|
Fixed a few more tests
|
2020-04-21 21:13:00 -07:00 |
|
|
snipe
|
c5e587f33b
|
Added codeception testing modules for —dev
|
2020-04-21 20:15:45 -07:00 |
|
|
snipe
|
7a33e335d4
|
Fixes PSR autoloading issue
|
2020-04-21 20:15:24 -07:00 |
|
|
snipe
|
bbc2ac2f9d
|
Updated tests with new location.id!=location.parent_id rule
|
2020-04-21 19:51:42 -07:00 |
|
|
snipe
|
c02adace61
|
Ensure at the model level that location.id/user.id and location.parent_id/user.manager_id cannot be the same
|
2020-04-21 19:51:20 -07:00 |
|
|
snipe
|
5dc64ea91b
|
Re-added EasySlugger to fix tests
|
2020-04-21 19:28:24 -07:00 |
|
|
snipe
|
1c5486e588
|
Updated test method for newer codeception from assertContains to assertStringContainsString
|
2020-04-21 19:28:06 -07:00 |
|
|
snipe
|
05e9861b71
|
Checkin/checkout fixes
|
2020-04-21 11:28:31 -07:00 |
|
|
snipe
|
cff2a65f62
|
Fixed broken if/else in view from bad merge
|
2020-04-21 11:13:29 -07:00 |
|
|
snipe
|
7a6ca5cb40
|
Tempt fix for css weirdness
TODO: figure out why overrides isn’t being compiled into css/dist/all.css
|
2020-04-21 11:03:32 -07:00 |
|
|
snipe
|
63259418b2
|
Package updates
|
2020-04-21 10:43:25 -07:00 |
|
|
snipe
|
1d8c3a73ea
|
Use non-min version of skin until we can get the other webpack stuff sorted
|
2020-04-21 10:43:04 -07:00 |
|
|
snipe
|
e786ef8290
|
Pull branding back to develop normal
|
2020-04-21 10:42:37 -07:00 |
|
|
snipe
|
64b0dbdafe
|
Fixed mismatched html tag
|
2020-04-21 10:42:09 -07:00 |
|
|
snipe
|
381d2369b6
|
Updated CSS assets
|
2020-04-21 06:33:44 -07:00 |
|
|
snipe
|
29b05d2020
|
Fixed syntax error in image upload request from mangled merge
|
2020-04-21 06:29:57 -07:00 |
|
|
snipe
|
c38bbfc8bd
|
Removed title from more info link
|
2020-04-21 06:29:34 -07:00 |
|
|
snipe
|
be446eedb0
|
Updated html styles on settings index
|
2020-04-21 06:29:08 -07:00 |
|
|
snipe
|
dc6e329d96
|
Fixed name in comments
|
2020-04-21 06:18:24 -07:00 |
|
|
snipe
|
72b3228d82
|
Fixed HTML tags
|
2020-04-21 06:15:31 -07:00 |
|
|
snipe
|
f6446bae79
|
Bumped vendor libraries
|
2020-04-21 04:34:11 -07:00 |
|
|
snipe
|
aaaf5f8b42
|
Missed a mismatched h2
|
2020-04-21 04:23:53 -07:00 |
|
|
snipe
|
4fe32e1c9c
|
Fixed broken h2 tag
|
2020-04-21 04:22:09 -07:00 |
|
|
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 |
|