snipe
|
f200960a57
|
Aaaand more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 22:26:57 +01:00 |
|
|
snipe
|
a77dcad336
|
More links
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 20:30:53 +01:00 |
|
|
snipe
|
0c09f2b2c0
|
Moar icon replacement
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 18:13:49 +01:00 |
|
Godfrey M
|
6b1784f2ee
|
makes shortcuts optional
|
2024-08-07 10:47:16 -07:00 |
|
|
snipe
|
5dea3f4495
|
Added blade component to checkin/checkout pages
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 12:47:33 +01:00 |
|
|
snipe
|
759ab78f80
|
Added more redirects
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 11:27:36 +01:00 |
|
|
snipe
|
38affea3f3
|
More updates
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:57:10 +01:00 |
|
|
snipe
|
2bfee0c29a
|
Few more tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:21:11 +01:00 |
|
|
snipe
|
c08bd8f88b
|
Nicer consumables layout
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:11:45 +01:00 |
|
|
snipe
|
1527679f4b
|
Handle deletions on the observer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 17:26:43 +01:00 |
|
|
snipe
|
23f1489b2b
|
Added history tab
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:46:49 +01:00 |
|
|
snipe
|
d9a114090b
|
Added buttons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:18:33 +01:00 |
|
|
snipe
|
12e107a71b
|
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout
Bulk Consumable Checkout
|
2024-05-29 19:42:25 +01:00 |
|
|
Godfrey M
|
1f7f9717c5
|
fixes checkout bug
|
2024-01-10 11:35:32 -08:00 |
|
|
snipe
|
754ec7563a
|
Fixed consumable user view route name
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-29 15:15:03 +01:00 |
|
|
snipe
|
f53db8ba75
|
Fixed #13562 - allow inline view for uploaded files
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-05 18:28:01 +01:00 |
|
|
snipe
|
a569a99e61
|
Used inline markdown in views
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-12 16:57:04 +01:00 |
|
ak-piracha
|
bb013d5c3c
|
Bulk Consumable Checkout
|
2023-05-21 22:49:00 +09:30 |
|
|
snipe
|
607ab3988a
|
Added supplier to edit/creatre blade
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-13 11:06:07 -07:00 |
|
|
snipe
|
1af7cdb715
|
Wrapped the image delete into the existing image upload partial
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 22:35:55 -07:00 |
|
Marcus Moore
|
fe6295a5e4
|
Update slack_* properties to webhook_*
|
2023-03-22 14:43:00 -07:00 |
|
|
snipe
|
2da4578aa5
|
Merge branch 'develop' into slack_message
|
2023-02-01 13:43:09 -08:00 |
|
akemidx
|
cafe8f3074
|
notification for slack message
|
2023-01-24 16:20:20 -05:00 |
|
|
snipe
|
cfa342c81a
|
Updated HTML for “standard” image edit/delete
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 16:23:04 -08:00 |
|
|
snipe
|
563a252d18
|
Updated checkboxed with missing minimal class for iCheck
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-21 14:57:52 -08:00 |
|
|
Marcus Moore
|
e506ed7950
|
Remove extra quote
|
2023-01-18 13:42:09 -08:00 |
|
|
Marcus Moore
|
07744ca7bd
|
Reference the consumable instance instead of the model
|
2023-01-18 13:41:58 -08:00 |
|
|
Marcus Moore
|
5282ca47b3
|
Allow users with consumables.files ability to upload files for consumables
|
2023-01-17 17:16:50 -08:00 |
|
|
snipe
|
7cb1ca8754
|
Fixed image path to show preview
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-03 13:51:48 -07:00 |
|
|
snipe
|
2106b64da6
|
Fixed some layout issues
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 19:06:49 -07:00 |
|
|
snipe
|
fa79a6c15f
|
Skip storage:: facade on missing images
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 18:19:13 -07:00 |
|
|
snipe
|
761da534f3
|
Updated consumables UI to allow uploads and display files
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-01 17:53:08 -07:00 |
|
|
Godfrey M
|
4fa01350c3
|
adds shortcuts for listing, creating, and saving
|
2022-10-11 12:00:15 -07:00 |
|
|
snipe
|
8de7e9a2ab
|
Use route name in case the user biffs the checkout twice
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:17:52 -07:00 |
|
|
snipe
|
dd0260c3be
|
Use old note on validation failure
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:15:29 -07:00 |
|
|
snipe
|
0d9eccb7eb
|
Addeed note field
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:03:12 -07:00 |
|
|
snipe
|
0a9bd07f20
|
Disallow checkout if qty = 0
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-02 12:27:58 -07:00 |
|
|
snipe
|
53ff28d2b0
|
Handle consumables route names
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-01 16:07:56 -07:00 |
|
|
snipe
|
5fe1078013
|
Squashed commit of the following:
commit a011b07d99
Merge: b392ed269 6059e9e11
Author: snipe <snipe@snipe.net>
Date: Tue Jun 14 17:52:50 2022 -0700
Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables
Added fullscreen option to tables
commit b392ed269b
Merge: 693043e64 e6d792bdf
Author: snipe <snipe@snipe.net>
Date: Tue Jun 14 17:52:41 2022 -0700
Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header
Tweaked CSS for smaller padlock
commit 6059e9e119
Author: snipe <snipe@snipe.net>
Date: Tue Jun 14 17:49:00 2022 -0700
Added fullscreen option to tables
Signed-off-by: snipe <snipe@snipe.net>
commit e6d792bdf7
Author: snipe <snipe@snipe.net>
Date: Tue Jun 14 17:43:12 2022 -0700
Tweaked CSS for smaller padlock
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 17:54:18 -07:00 |
|
|
snipe
|
b876d0abb0
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
|
2022-03-03 21:59:38 -08:00 |
|
|
snipe
|
5266b2c71f
|
Added notes field to view blades
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:30:27 -08:00 |
|
|
snipe
|
61f16f47a2
|
Use Helper alias
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-28 19:44:55 -07:00 |
|
|
snipe
|
f0da1977fb
|
Small visual improvements on consumables view
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-26 14:32:51 -07:00 |
|
|
snipe
|
7e41c74cc3
|
Updated more fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-26 01:11:08 -07:00 |
|
|
snipe
|
e03d7b7016
|
More fa icon updates
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 13:07:02 -07:00 |
|
|
snipe
|
0503a51cae
|
Corrected validation to match model
|
2020-09-03 16:58:45 -07:00 |
|
|
snipe
|
19d8d7b146
|
Updated components and consumables to use storage facade
|
2020-08-12 13:02:54 -07:00 |
|
Daniel Meltzer
|
debdccf5f1
|
Remove old help text translation that doesn't exist any more
|
2020-04-30 10:35:11 -04:00 |
|
|
snipe
|
cb71bcc4af
|
Switch to old() helper
|
2020-04-21 03:58:31 -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 |
|