256 commits

Author	SHA1	Message	Date
Matthew Nickson	9381ba2404	Merge branch 'develop' into sum_cost_by_quantity	2021-11-21 18:59:34 +00:00
Wächtler, Yannick	04fec144a0	Added localization strings for partials, added file structure	2021-11-19 12:12:11 +01:00
Matthew Nickson	90ca66834b	Fixed sumFormatterQuantity if using 1.234,56 fomat ... Previously sumFormatterQuantity used the parseFloat to convert the string purchase_cost to a floating point number. parseFloat does not return the correct value when using the comma format. To fix this sumFormatterQuantity now used the cleanFloat function to convert purchase_cost to a float. Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2021-10-30 22:48:45 +01:00
snipe	798f6d65de	Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self ... Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view	2021-10-28 17:53:24 -07:00
snipe	aa8f1378c9	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Http/Controllers/Accessories/AccessoriesController.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Assets/BulkAssetsController.php # app/Http/Controllers/Components/ComponentsController.php # app/Http/Controllers/Consumables/ConsumablesController.php # app/Http/Controllers/Licenses/LicenseFilesController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/UserFilesController.php # app/Http/Transformers/AssetsTransformer.php # app/Http/Transformers/LicensesTransformer.php # app/Importer/UserImporter.php # app/Models/Asset.php # config/app.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/en/admin/users/message.php # resources/lang/is/button.php # resources/lang/ja/admin/kits/general.php # resources/lang/ro/admin/users/general.php # resources/lang/zh-HK/admin/depreciations/general.php # resources/lang/zh-HK/admin/models/general.php # resources/views/hardware/qr-view.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/users/view.blade.php # routes/web.php # routes/web/hardware.php # routes/web/models.php # routes/web/users.php	2021-10-20 17:26:41 -07:00
snipe	bda23bb1e6	Fixes possible XSS on all-file-types export ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-15 11:50:52 -05:00
Matthew Nickson	8996c24d1f	Merge branch 'develop' into sum_cost_by_quantity	2021-10-10 13:01:44 +01:00
snipe	3594ec9905	Handle bulk check and uncheck ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:58:16 -07:00
snipe	52caee2a9f	Handle checking and unchecking for bulk actions ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:18:26 -07:00
Brady Wetherington	ae466be153	Fix license output, tweak CleanFloat function to handle numbers over 1 million	2021-09-28 19:10:25 -07:00
snipe	9311f8694f	Fixed incorrect icon for map marker ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 09:35:48 -07:00
snipe	7e41c74cc3	Updated more fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 01:11:08 -07:00
snipe	299ad681f7	More fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 07:21:30 -07:00
snipe	ad6f073c82	Few more icon updates ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:38:23 -07:00
snipe	8aba37522d	More FA icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:18:22 -07:00
snipe	9b78b25372	Grr. 100 should be 1000 ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 21:28:59 -07:00
snipe	7df4f98e19	Bump number per page up to 1000 ... Use this shit at your own peril. Very large pages will load slowly, as these are very complex queries. Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 21:25:22 -07:00
Brady Wetherington	e28db2d221	Fix regression for NULL valued numbers in the summary calculation	2021-08-19 12:01:47 -07:00
Brady Wetherington	4519f6e180	Fixed sum total calculation on Bootstrap Table pages	2021-08-18 14:13:31 -07:00
snipe	cce808c784	Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628] ... Duplicates d4e46ee41f but on v5 Signed-off-by: snipe <snipe@snipe.net>	2021-08-17 21:59:33 -07:00
Computroniks	8121d904e7	Licence cost calculation ... Licences use diffrent key to track quantity. sumFormatterQuantity has been modified to detect which key to use. Signed-off-by: Computroniks <mnickson@sidingsmedia.com>	2021-08-04 22:33:39 +01:00
Computroniks	f994af16da	Added function to calculate cost based on quantity ... sumFormatterQuantity takes the same input as sumFormatter but instead of calculating the specified columns total it calculates the total purchase cost of an item based upon its quantity. Also updated affected pressenters to use this formatter. Signed-off-by: Computroniks <mnickson@sidingsmedia.com>	2021-08-04 22:09:50 +01:00
Ivan Nieto Vivanco	35ffe8b902	Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view	2021-07-20 18:56:22 -05:00
snipe	57b9b571dc	Fixed #9531 - highlight search box when filled, add clear button (#9534)	2021-05-04 22:00:34 -07:00
Nikolay Didenko	06e641b782	Do not override per table data-id-cookie-table attribute by current route name globally (#7835)	2021-03-29 20:05:24 -07:00
Ivan Nieto Vivanco	9ed226a0af	Fixes links in Models Actions, and to view the fieldset assigned to that Model. (#9232)	2021-03-01 13:08:29 -08:00
Ivan Nieto	72f9fe444d	Fix for default parameters in JS functions IE (#8973) ... * Small fix for IE which doesn't support default parameters in the function definition * Stylistic changes for better comprehension	2021-01-05 19:25:30 -08:00
Evgeny	bbf7fbcff4	Localization digit separator feature. (#8915) ... Provides an ability to localize the purchase_cost field in front-end hardware index table. Has two digit separator formats in admin settings with comma and dot.	2020-12-15 11:49:13 -08:00
Brady Wetherington	a5423649f4	This is the smallest set of changes we can use to work around a change in functionality ... in Bootstrap Tables. This should remedy some of the issues we've been having with large GET strings being sent to the back-end by the Assets system.	2020-11-09 17:36:07 -08:00
snipe	249b9b7509	Fixed [ch15086] - [object object] in companies date displays	2020-09-03 19:40:17 -07:00
snipe	b433b49469	Ficing webpack, CSS and JS (*whew* that sucked) ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 22:41:33 -07:00
snipe	b670371e0b	Ugggh… fixing a donked merge	2020-04-21 03:30:21 -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	2d2cd68061	Switched to h2 from h4	2020-04-01 03:51:08 -07:00
snipe	4dcc1ffdbc	More form labels	2020-04-01 02:22:24 -07:00
snipe	5c68353e62	Use non-min bs tables for now	2020-03-28 01:36:35 -07:00
snipe	a8f6bbd86a	Added alt text to image formatter in bootstrap tables	2020-03-27 22:01:24 -07:00
snipe	88cf456386	Adding Dept to license seats (#7609) ... * Adding Dept to license seats * Added query scope to order by department * Make license seat department sortable * Disable license seat internal search - this never actually worked	2019-11-21 22:03:56 -08:00
snipe	407445456a	Merge branch 'features/6204_email_audit-alerts' into develop ... # Conflicts: # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/LicensesController.php # composer.json # composer.lock # config/version.php # resources/views/auth/two_factor_enroll.blade.php	2019-05-06 08:45:13 -04:00
snipe	e5c2d77c7d	Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992) ... * Added upcoming audit report TODO: Fid diff/threshold math * Added route to list overdue / upcoming assets via API * Controller/API methods for due/overdue audits We could probably skip this and just handle it via view in the routes… * Added query scopes for due and overdue audits * Added audit due console command to kernel * Added ability to pass audit specs to main API asset search method * Added audit presenter * Added bootstrap-tables presenter formatter to display an audit button * Added gated sidenav items to left nav * Added audit due/overdue blades * Cleanup on audit due/overdue console command * Added language strings for audit views * Fixed :threshold placeholder * Removed unused setting variable * Fixed next audit date math * Added scope for both overdue and upcoming * Derp. Wrong version * Bumped version (I will release this version officially tomorrow)	2019-05-05 22:32:52 -04:00
snipe	8154d1116c	Added bootstrap-tables presenter formatter to display an audit button	2019-05-05 19:21:06 -04:00
snipe	61afdeac2e	Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop	2019-03-08 16:18:48 -08:00
Dmitrii Minaev	e01e0c5596	Add licenses, accessories and consumables table presenters app\Presenters\PredefinedKitPresenter.php resources\views\partials\bootstrap-table.blade.php ... Add refresh licenses, accessories and consumables tables refresh when add a new element resources\assets\js\snipeit_modals.js Some design fixes resources\views\kits\edit.blade.php Add default value to form (template) resources\views\modals\kit-model.blade.php New routes for kit accessories and kit consumables routes\api.php New routes for kit models, kit accessories and kit consumables routes\web\kits.php New templates	2019-01-27 23:19:24 +03:00
snipe	1eace04ad9	Handle asset maintenances that do not have a valid asset associated	2019-01-16 02:26:42 -08:00
snipe	c055e3af21	Only try to return the asset tag link if a valid asset id has been passed	2019-01-16 02:19:35 -08:00
Minaev Dmitriy	9d5cd27575	New save mechanic	2018-10-31 16:06:38 +03:00
Minaev Dmitriy	f1f7694835	Merge remote-tracking branch 'remotes/upstream/develop' into develop	2018-10-19 19:00:53 +03:00
Minaev Dmitriy	0e66c3cb56	Predefined kits test	2018-10-19 17:30:25 +03:00
Wes Hulette	d715ecf41d	Fixed: Tooltips (#6309) ... * Fixed missing oauth tables during setup. * Fixed missing tooltips Updated spelling in bootstrap-table.blade.php to use bootstrap data element. Using custom jquery-ui without tooltips to fix conflict issue. * Removed custom jQuery ui file added fix in bootstrap.js file	2018-10-09 15:20:27 -07:00
snipe	827295a989	Fixed tooltips	2018-09-07 05:39:56 -07:00
Wes Hulette	bfb5920677	Added #5956 - Moved bootstrap-tables to npm (#6139) ... Created single bootstrap-tables js and css file.	2018-08-28 13:10:27 -07:00
snipe	6f8680efa6	Added external link formatter to BS tables	2018-08-01 18:01:31 -07:00
Azerothian	66c3f5432d	implemented specific seat checkout (#5887)	2018-07-23 20:28:45 -07:00
snipe	9e0544e735	Fixed #5617 - incorrect url to fieldset editing	2018-05-29 10:41:46 -07:00
snipe	0be69f57ac	Improved files display	2018-05-02 14:13:06 -07:00
snipe	3662a58ad8	Removed unusued parameters in BS table formmatters	2018-05-01 21:35:07 -07:00
snipe	1ef4cc9fc2	Fixed #4301 - added image upload to audit	2018-04-24 02:54:54 -07:00
snipe	8a6713d5c0	WIP - Improved requested assets (#5289) ... * WIP - beginning of improved requested assets - Use Ajax tables for faster loading - Use new notifications for requesting an asset TODO: - Use ajax tables for requestable asset models - Use new notifications for canceling an asset request - Expire requests once the asset has been checked out to the requesting user * Only show asset name in email if it has one * Refactor requested method to only include non-canceled requests * Refactored requestable assets to log request and cancelation * Added softdeletes on checkout requests * Differentiate between canceling and deleting requests * Added asset request cancelation notification * Added timestamps and corrected unique key on requests table * Improved requests view * Re-use blade for cancel/request email * Refactored BS table formatter for requested assets * Location name min reduced to 2 * Added PAT test as maintenance option This needs to be refactored into database-driven options with a UI * Better slack message * Added getImageUrl method for assets * Include qty in request notifications TODO: - Try to pull requested info from original request for cancelation, otherwise it will default to 1 * Removed old asset request/cancel emails * Added user profile asset request routes * Added profile controller requested assets method * Added blade link to requested assets for profile view * Sort user history desc * Added requested assets blade * Added canceled at to checkoutRequest method * Include qty in request * Fixed comment, removed allowed_columns * Removed Queable methods, since we don’t use a queue * Fixed return type in method doc * Fixed version number * Changed id to user_id for clarity	2018-04-04 17:33:02 -07:00
snipe	36cd63836e	Fixed #5151 - added asset tag to maintenances	2018-03-05 16:26:40 -08:00
snipe	6ffad6043f	Fixed issue where bootstrap tables didn’t use a default page size	2018-02-21 05:44:41 -08:00
snipe	d28c2af7de	Fixed bootstrap table issue if per page was set to 10	2018-02-21 04:41:44 -08:00
snipe	b3d673b0aa	Fixed #5037 - use line breaks in notes in table view	2018-02-16 21:38:56 -08:00
snipe	3744a68daf	Features/better table options (#5018) ... * Added CSS for table toolbar * Use maintenances API for table listings * NIcer layout for allowed_columns in maintenances API * Fixed #5014 - bootstrap cookie issues * Fixed #5015 - bug when saving settings * Refactored datatable code to use data attributes * Updated dashboard with new table code * Added - Order by group user count * Updated groups to use new table attributes * New license listing table code * More bootstrap table implementations * More BS table refactoring * Improved bootstrap assigned assets * New bootstrap for reports * Misc BS fixes * FIxed small issue with asset history display * Removed multisort option * JS refactor	2018-02-16 13:22:55 -08:00
vcordes79	f4e9d245d0	Status labels (#4895) ... * fix statuslabels * fix statuslabels	2018-01-23 18:08:54 -08:00
snipe	5d4bbc393e	Fixed #4837 - link phone numbers	2018-01-20 00:20:45 -08:00
snipe	aac379daeb	If nopages is passed, hide page numbers ... This seems weird since we’re checking for a negative, but there are only a few spots where we wouldn’t want page numbers, namely the dashboard sruff	2018-01-16 07:37:06 -08:00
snipe	6bfd428c2e	Use real status label names, even if deployed	2018-01-15 21:03:26 -08:00
snipe	d109ca30e2	Improved - allow searching on most detail views with additional tables	2018-01-11 15:16:53 -08:00
snipe	7f674fdd35	Require implicit search	2018-01-11 13:18:06 -08:00
snipe	55b9f1207d	Updated bootstrap tables	2018-01-10 22:53:54 -08:00
snipe	c31362655c	Refactored BS tables include for clearer separation of simple v not simple	2018-01-10 20:34:36 -08:00
snipe	c6a956382f	Fixed #4784 - cookie not always being set correctly for ajax tables	2018-01-10 20:04:41 -08:00
snipe	bab0bda174	Added custom formatter for license seats (WIP)	2018-01-10 18:58:55 -08:00
snipe	612f23f6e0	Added #2893 - track changes on asset edits	2017-12-12 04:59:28 -08:00
snipe	92afd5f232	Removed debugging console code	2017-11-30 11:48:59 -08:00
snipe	9430c4bf43	Added sanity checks in BS tables formatter	2017-11-22 06:20:51 -08:00
snipe	538757317b	Fixed #4411 - broken activity report if purge didn’t remove relationship entries	2017-11-22 06:20:28 -08:00
snipe	d98d06377e	Fixed #4098 - autolink URL and email addresses in listing	2017-11-21 22:34:53 -08:00
snipe	b567ffdcfe	Fixed #2855 - checkin for components	2017-11-08 06:06:05 -08:00
snipe	28a4293a0b	Fixed #4370 - user’s listing flashing then no results	2017-11-02 11:19:34 -07:00
snipe	a844d5b018	Added pagination, nicer formatting for requested assets	2017-11-02 04:17:14 -07:00
snipe	1e21cef218	Set max page size to 500	2017-10-28 07:29:03 -07:00
snipe	0f5e0dcd4f	Added nobr for nicer formatting of bs tables status and deployed to	2017-10-28 07:12:47 -07:00
snipe	8d68bb7a57	Sticky headers for bootstrap tables	2017-10-24 05:22:26 -07:00
snipe	287b150b7f	Show disabled delete button if thing can’t be deleted	2017-10-19 11:29:58 -07:00
snipe	2b803a6a6c	Fixes #4257 - use admin url when editing groups	2017-10-19 02:22:05 -07:00
snipe	c5893b4445	Fixes #4249 - display deployed location in listing	2017-10-19 01:30:40 -07:00
snipe	5cd2857d5d	Use footer sumformatter for cost totals	2017-10-18 06:24:36 -07:00
snipe	c069829b33	Fixes #906 - groups view	2017-10-17 21:43:57 -07:00
snipe	9e9a5b7a53	Changed checkin/checkout buttons to different colors for easier visibility	2017-10-17 11:32:09 -07:00
snipe	a054cec7c9	Supress output if no title is given ... This should never happen, but….	2017-10-05 22:51:33 -07:00
snipe	c8bed867da	Export PDF as landscape	2017-10-03 07:32:18 -07:00
snipe	24cad588bd	Added preceding icons in polymorphic formatter	2017-09-29 17:32:16 -07:00
snipe	43ff66e4d9	More UI tweaking for meta statuses	2017-09-29 15:24:33 -07:00
snipe	fe1975067a	Hopefully clearer status label meta info	2017-09-29 12:03:02 -07:00
snipe	9ce2d1f560	Merge branch 'csp-middleware' into develop	2017-09-29 04:14:33 -07:00
snipe	aab409dec2	Fixes #4061 - bulk checkout error	2017-09-28 22:22:21 -07:00
snipe	4d32f2b337	Fixes #4059 - accessories view	2017-09-28 21:18:00 -07:00
snipe	46d87849f4	Added content security middleware	2017-09-28 19:45:15 -07:00
snipe	3d7277398c	Fixes #4057 - sig file in lightbox	2017-09-28 15:13:05 -07:00
snipe	bd0498aa69	Fixes #4016 - signature file missing from history tab	2017-09-27 12:58:08 -07:00
snipe	f2ee7dcabb	Fixes #4001 - license checkout not working	2017-09-25 21:40:43 -07:00
snipe	47909b93f7	Fixed deleted users/restore users view	2017-09-06 17:11:43 -07:00
Daniel Meltzer	987536930c	Assorted fixes (#3923) ... * Fix some n+1 problems * Use route in notification dropdown to make sure we link to correct page * Work on better UI support for checkout to non-user. Fix links on index bootstrap table, work towards eliminating assignedUser * Remove Asset::assigneduser() relationship. Instead add a checkedOutToUser() method and/or port to using assignedTo() * Adjust string to fit new reality * Fix #3780. Move the consumables getDataView method to the ApiController. Not entirely RESTful, but it's a weird method that probably doesn't need its own controller and the functionality would be strange to stack on the userscontroller... * Fix file uploads to assets and restore the delete route. * Add asset maintence edit action to index. * Suppliers asset list should link to the related asset, not to the supplier with same ID. * Asset models page should use polymorphic formatter on assigned to to better handle assorted item types. * Comment out more assigneduser fallacy until we figure out the query builder approach to searching for location text.	2017-09-05 17:54:58 -07:00
snipe	479f422e68	Added default if no audit settings are in place	2017-08-26 15:27:50 -07:00
snipe	51d74ac06d	Auduting improvements	2017-08-25 18:40:20 -07:00
snipe	6e30fa6922	Fixes custom fields in asset listing where no custom fields were assigned	2017-08-23 03:28:13 -07:00
snipe	06c5bce3c7	Fixes #3865 - employee number mislabeled in list output	2017-08-22 21:40:35 -07:00
snipe	25dc26aac3	Added 30 as page selector value for label printing	2017-08-21 22:31:37 -07:00
snipe	ee7348d0d5	Better fix for javascript formatter for employee number	2017-07-26 16:47:47 -07:00
snipe	ac29b142dc	Adds max thumbnail width to asset listings, settings	2017-07-25 19:36:38 -07:00
snipe	9bcfe0748b	Make custom fields into their own JSON array	2017-07-08 18:44:28 -07:00
snipe	0cc9c214aa	Added tooltip for undeployable items	2017-07-08 13:39:07 -07:00
snipe	c48bcb7ed1	Added tooltips for checkin/checkout	2017-07-08 13:36:37 -07:00
snipe	09de201027	Removed question mark on delete title	2017-07-08 13:36:25 -07:00
snipe	e79260a0d4	Fixes #3732 - broken tooltips and weird select2 option text behavior ... The solve here was a few things - first, load jquery-ui before bootstrap. They have conflicting tooltips. Second, initiate the tooltips in the wenzhixin/bootstrap-table formatter using `data-tooltip=“true”`, and thirdly, add some JS that tells BS table to inititalize tooltips within the table using that `data-tooltip=“true”` business	2017-07-08 13:21:13 -07:00
snipe	c2e8803d1e	Addec clone button back to models, assets, licenses, etc	2017-07-07 18:45:49 -07:00
snipe	66eaff739a	More npm/css/js updates	2017-05-31 12:34:05 -07:00
snipe	fd0da6ecf0	Ignore the icon column in exports	2017-05-31 02:03:09 -07:00
snipe	3c167c9d33	Remove debugging frowny-face	2017-05-23 15:06:43 -07:00
snipe	3724442318	Exclude some BS table calls if it’s just a simple ajax table with no sorting/searching	2017-05-23 14:32:58 -07:00
snipe	6775c39a5e	Added simple_view to use compact, no pagination view of tables	2017-05-23 09:25:20 -07:00
snipe	d3b07411da	Added depts to bootstrap-table javascript formatters	2017-05-23 02:50:51 -07:00
snipe	79197a719e	Fixes BS tables for items that don’t have a checkin	2017-03-11 12:11:24 -08:00
snipe	23b1a4ca34	Higher per page	2017-03-11 04:39:35 -08:00
snipe	875d0dd343	Added advanced search to assets	2017-03-11 04:26:01 -08:00
snipe	c132036f5c	Fixes #3311 - more fields for manufacturers	2017-03-10 22:08:59 -08:00
snipe	f1fd152513	Fixes #3335 - added additional pagination at top of table	2017-03-10 20:35:03 -08:00
snipe	dc38e575d9	Allow date/time formatting selection in settings	2017-03-03 17:29:41 -08:00
snipe	904be03ffd	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2017-02-22 22:20:32 -08:00
snipe	ebbc2a60c3	Fix JS error when there is no row.update/delete defined	2017-02-21 15:40:25 -08:00
Andrea Bergamasco	4f73a13c6b	Hotfix/translate row delete msg (#3305) ... * Toggles the disabled state of auto_increment_prefix To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate. Fixes #1390 * Delete asset image: made checkbox more visible Related to #3153 * Added missing translation to bootstrap table partial The "Are you sure to delete" confirmation was hardcoded. Added translation row to all locales and other small corrections to it/general lang file.	2017-02-21 14:25:46 -08:00
snipe	a18e90c22a	Fix delete modals	2017-02-15 23:04:49 -08:00
snipe	959fafe04b	Expanded checkin/checkout buttons formatter	2017-02-08 18:21:03 -08:00
snipe	86198badbb	Added more company_id filtering, more transformers	2017-02-08 08:48:41 -08:00
snipe	85d5b75de6	Removed console debugging messages	2017-02-03 03:55:43 -08:00
snipe	cddd3cdb81	Added spinner icon to loading message	2017-02-03 03:54:38 -08:00
snipe	541a5e6776	Groups API starter ... Edit/Create still broken for some reason	2017-02-01 18:50:28 -08:00
snipe	7086ac8a8b	Tweaks to status labelas listing display	2017-02-01 17:48:28 -08:00
snipe	5e9e6da577	Basic consumables API	2017-01-26 18:46:18 -08:00
snipe	5e9c69711b	Set trimonsearch to false to prevent weird trimming on search queries	2017-01-26 04:48:22 -08:00
snipe	5f49e7c1a7	Accessories API routes ... Still a bit of a WIP	2017-01-25 02:19:26 -08:00
snipe	75d35273c9	Pull image formatter out of dynamic loop, pass full url to formatter	2017-01-24 22:46:07 -08:00
snipe	04bb180a80	More bootstrap tables formatting	2017-01-24 22:25:17 -08:00
snipe	8f12486f6c	More generic javascript formatters, updated api routes	2017-01-24 21:04:38 -08:00
snipe	945d910ca2	Added columns to be ignored on export	2017-01-24 19:24:33 -08:00
snipe	e8310c8f3c	Additional API routes for licenses, manufacturers	2017-01-24 18:58:07 -08:00
snipe	d0f062458e	Additional API transformers, formatters	2017-01-24 17:07:00 -08:00
snipe	19cb428fb0	Asset and status formatters	2017-01-18 19:46:43 -08:00
snipe	bebb653a70	Pull common formatters into partial	2017-01-18 19:28:35 -08:00