MrM
|
e49c96a35e
|
Added EULAs in print user's assets
Added EULAs when we want to print all assets assigned to a users and ask him/her to sign.
|
2024-07-14 19:10:33 +02:00 |
|
Florent Bervas
|
d9a53460ff
|
Fix design inconsistency between assets and assigned assets in Print All Assigned report
|
2024-07-11 09:41:58 +00:00 |
|
Godfrey M
|
624632d0ca
|
removed push and endpush
|
2024-07-09 11:41:31 -07:00 |
|
Marcus Moore
|
c3e6e1144f
|
Merge branch 'develop' into chore/sc-23725/livewire3
|
2024-06-12 15:12:40 -07:00 |
|
|
Marcus Moore
|
60c7efae3c
|
Remove commented code
|
2024-06-05 11:48:10 -07:00 |
|
snipe
|
832ceeba56
|
Fixed missing endpush
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 09:57:10 +01:00 |
|
|
Marcus Moore
|
43616d1874
|
Remove alpine reference from webpack
|
2024-05-29 12:30:20 -07:00 |
|
|
Godfrey M
|
84cc88831d
|
adds signature for components
|
2024-03-26 12:18:10 -07:00 |
|
|
Godfrey M
|
f4f9b165a7
|
moves signature check inside of td
|
2024-03-26 11:24:34 -07:00 |
|
|
Godfrey M
|
3222d4c8df
|
adds signature check
|
2024-03-26 09:18:34 -07:00 |
|
|
Godfrey M
|
3173ead2e7
|
adds accessory signature to user print report
|
2024-03-26 09:11:54 -07:00 |
|
|
snipe
|
a0a5480c97
|
Added default location to print all assigned
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 18:55:47 +00:00 |
|
|
snipe
|
4b4d383509
|
Removed - it’s for another PR
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-19 15:00:26 +00:00 |
|
|
snipe
|
fcd130ae15
|
Layout improvements
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-18 21:17:46 +00:00 |
|
|
snipe
|
002fd4ce30
|
Nicer formatting for signoff
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-18 13:44:51 +00:00 |
|
|
snipe
|
7b4ecb275f
|
Use trans choice for language
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-18 13:29:01 +00:00 |
|
|
snipe
|
2df5d3a8ff
|
Fixed column selector
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-18 13:06:08 +00:00 |
|
|
snipe
|
85123b3e66
|
Rework print page
Still seeing a weird error tho, not done yet
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-13 12:36:17 +00:00 |
|
|
snipe
|
c5c6b3bbc6
|
Starting the revised print page
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-11 14:23:25 +00:00 |
|
|
snipe
|
3f5cc2507d
|
Used updated_at instead
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-10 16:39:49 +00:00 |
|
|
snipe
|
22996895d8
|
Check for valid model
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-31 16:04:19 +00:00 |
|
|
snipe
|
28641493ca
|
Check that the category exists
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-31 15:58:59 +00:00 |
|
|
snipe
|
161999fbca
|
Fixed #12772 - use the APP_URL config more consistently
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-05 16:05:40 -07:00 |
|
akemidx
|
f38f6f57ae
|
fixed localization and formatting. simplified code to remove php snippet
|
2023-03-15 14:00:29 -04:00 |
|
|
akemidx
|
9c5ee060d3
|
WIP string/int error
|
2023-03-14 15:01:56 -04:00 |
|
|
akemidx
|
4533982345
|
added time of day
|
2023-03-09 15:11:07 -05:00 |
|
|
akemidx
|
2a4d30a748
|
forgot to add datestamp to title of page
|
2023-03-08 15:09:33 -05:00 |
|
|
akemidx
|
cd9f2f7fb7
|
datestamp for print all assigned form generation
|
2023-03-08 14:56:14 -05:00 |
|
|
snipe
|
e21d0729c1
|
Add jobh title to header in print assets view
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-28 19:19:42 -08:00 |
|
|
snipe
|
8114d01799
|
Only show sig file if there is a value for accepted sig
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-11 14:46:45 -07:00 |
|
|
snipe
|
780222d372
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
|
2022-05-10 17:26:26 -07:00 |
|
|
snipe
|
caef98d36d
|
Patched #11025 to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 02:06:12 -07:00 |
|
|
snipe
|
fba731ac1c
|
Missed a few hard coded english strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 02:01:17 -07:00 |
|
|
snipe
|
784bf4d784
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .github/ISSUE_TEMPLATE/feature_request.yml
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ReportsController.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/users/print.blade.php
# webpack.mix.js
|
2022-05-06 01:52:43 -07:00 |
|
|
snipe
|
39ee825ba2
|
Fixed html lang specification
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 01:32:20 -07:00 |
|
|
snipe
|
c0e9393092
|
Fixed #10890 - use translation strings in user asset printout
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 01:30:58 -07:00 |
|
|
snipe
|
5370c2ca42
|
Merge pull request #10941 from Godmartinz/gh8856_signature_not_showing_in_print_all
[Fix] changes the query for the accept signature on print blade
|
2022-05-05 13:32:37 -07:00 |
|
|
snipe
|
9aac1cbba4
|
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
|
2022-04-28 17:49:06 +01:00 |
|
|
Godfrey M
|
380cb38b7d
|
changes the query for the accept signature on print blade
|
2022-04-14 17:17:28 -07:00 |
|
Ivan Nieto Vivanco
|
2d213a9c77
|
Make the report take the dates of pivot table instead of asset log
|
2022-04-05 12:57:49 -05:00 |
|
|
snipe
|
781b426018
|
Fixed #10826 - parse error on translation string for print all assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-16 08:50:47 -07:00 |
|
Wächtler, Yannick
|
04d649122b
|
Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO
|
2022-01-06 12:35:37 +01:00 |
|
|
Wächtler, Yannick
|
1b76185798
|
Added TODO: comments to pages, where there are non-localized strings, in order to keep track of them
|
2021-11-19 15:32:13 +01:00 |
|
|
snipe
|
c6b26965a0
|
Check for valid category name
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-13 15:47:13 -07:00 |
|
Joly0
|
9a429952ff
|
update print.blade.php
|
2021-06-15 08:52:01 +02:00 |
|
|
Joly0
|
72f27ccc5b
|
Update print.blade.php
|
2021-06-11 11:05:39 +02:00 |
|
|
snipe
|
9eea46adef
|
Fixed parse error in user print view
Signed-off-by: snipe <snipe@snipe.net>
|
2021-05-20 13:53:43 -07:00 |
|
|
Joly0
|
31b2287a57
|
Update print.blade.php (#9426)
Fixes #9418
|
2021-04-14 10:20:36 -07:00 |
|
|
snipe
|
b9bab05ac3
|
Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/users/print.blade.php
|
2021-04-05 20:55:49 -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 |
|