Brady Wetherington
5a776af091
This disables the display of HTML content during exports, without enabling XSS attacks
2022-04-07 16:27:06 +01:00
snipe
8ccf148799
Fixed #10881 - bad merge with bootstrap-tables changes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 22:57:00 +01:00
snipe
a937bd34f6
Merge master back down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 16:28:43 +01:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
2022-03-22 10:10:56 -07:00
snipe
42220cc566
Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving
...
Fixes Customfields with boolean format not saving [ch-9973]
2022-03-19 22:10:54 +00:00
Ivan Nieto Vivanco
6ed9ed0e79
Add field type boolean to custom fields list all
2022-03-16 17:21:05 -06:00
Godfrey M
b2e78e3382
formats most of the pdf blade
2022-03-16 15:53:32 -07:00
Godfrey M
5fcc3c39f3
routes eula agreements for download correctly to the asset history
2022-03-16 11:56:56 -07:00
snipe
9db8bd782d
Merging master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 18:02:07 +00:00
Godfrey M
6386fa1c5e
clean up
2022-03-16 09:54:10 -07:00
Godfrey M
b2f7262cd2
adds table structure for asset history
2022-03-14 19:38:36 -07:00
Brady Wetherington
6f3e9033c2
One attempt to fix the 'datatable double-request' problem.
2022-03-07 12:52:57 -08:00
snipe
43c57c8461
Merge master into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Http/Controllers/BulkAssetModelsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ModalController.php
# app/Http/Transformers/GroupsTransformer.php
# config/version.php
# package-lock.json
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/less/overrides.less
# resources/lang/en/admin/hardware/message.php
# resources/lang/en/admin/settings/general.php
# resources/views/partials/bootstrap-table.blade.php
# routes/web.php
2022-01-12 20:51:33 -08:00
Wächtler, Yannick
f906dbd81e
Added missed translation strings, fixed the column width for the date selector (too small in certain languages)
2022-01-10 09:21:23 +01:00
Wächtler, Yannick
b77e7f88d4
fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix
2022-01-09 17:35:28 +01:00
Wächtler, Yannick
c3ab4c7512
Fixed the tables not displaying the correct language
2022-01-06 14:29:10 +01:00
Nuraeil
271c364ef8
Merge pull request #9 from snipe/develop
...
Merge snipe/snipe-it:develop into nuraeil/snipe-it:added-localized-strings
2022-01-04 10:48:51 +01:00
snipe
9b2dd6522f
Switch GET to POST for asset request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:36:08 -08:00
snipe
4ca2252e3b
Switches GET to POST for request assset
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:32:29 -08:00
Wächtler, Yannick
2901525194
Merge branch 'snipe-develop' into added-localized-strings
2021-12-17 00:22:08 +01:00
snipe
c3d55ee27e
Merge master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Models/Setting.php
# config/version.php
# resources/lang/af/button.php
# resources/lang/ar/button.php
# resources/lang/bg/button.php
# resources/lang/cs/button.php
# resources/lang/cy/button.php
# resources/lang/da/button.php
# resources/lang/de/button.php
# resources/lang/el/button.php
# resources/lang/en-GB/button.php
# resources/lang/en-ID/button.php
# resources/lang/es-CO/admin/groups/message.php
# resources/lang/es-MX/button.php
# resources/lang/et/admin/custom_fields/general.php
# resources/lang/et/admin/hardware/table.php
# resources/lang/et/admin/kits/general.php
# resources/lang/et/admin/manufacturers/message.php
# resources/lang/et/admin/models/general.php
# resources/lang/et/admin/settings/general.php
# resources/lang/et/button.php
# resources/lang/et/mail.php
# resources/lang/fa/button.php
# resources/lang/fa/help.php
# resources/lang/fi/button.php
# resources/lang/fil/button.php
# resources/lang/fr/button.php
# resources/lang/ga-IE/button.php
# resources/lang/he/button.php
# resources/lang/hr/button.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/auth/message.php
# resources/lang/hu/button.php
# resources/lang/hu/mail.php
# resources/lang/id/admin/hardware/table.php
# resources/lang/id/button.php
# resources/lang/it/button.php
# resources/lang/iu/button.php
# resources/lang/ja/button.php
# resources/lang/ko/button.php
# resources/lang/lt/button.php
# resources/lang/lv/button.php
# resources/lang/mi/button.php
# resources/lang/mk/button.php
# resources/lang/ml-IN/button.php
# resources/lang/mn/button.php
# resources/lang/ms/admin/hardware/table.php
# resources/lang/ms/admin/kits/general.php
# resources/lang/ms/admin/models/general.php
# resources/lang/ms/admin/models/message.php
# resources/lang/ms/admin/settings/general.php
# resources/lang/ms/button.php
# resources/lang/nl/button.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/auth/message.php
# resources/lang/no/button.php
# resources/lang/no/help.php
# resources/lang/no/mail.php
# resources/lang/pl/button.php
# resources/lang/pt-BR/button.php
# resources/lang/pt-PT/auth/message.php
# resources/lang/pt-PT/button.php
# resources/lang/pt-PT/mail.php
# resources/lang/ro/button.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/help.php
# resources/lang/sl/admin/custom_fields/general.php
# resources/lang/sl/admin/hardware/table.php
# resources/lang/sl/admin/kits/general.php
# resources/lang/sl/admin/manufacturers/message.php
# resources/lang/sl/admin/models/general.php
# resources/lang/sl/admin/settings/general.php
# resources/lang/sl/admin/users/general.php
# resources/lang/sl/auth/message.php
# resources/lang/sl/button.php
# resources/lang/sl/help.php
# resources/lang/sr-CS/button.php
# resources/lang/ta/button.php
# resources/lang/th/button.php
# resources/lang/th/mail.php
# resources/lang/tl/button.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/auth/message.php
# resources/lang/tr/button.php
# resources/lang/uk/button.php
# resources/lang/ur-PK/button.php
# resources/lang/vi/button.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-HK/button.php
# resources/lang/zh-TW/admin/hardware/table.php
# resources/lang/zh-TW/button.php
# resources/lang/zu/button.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/slack.blade.php
2021-12-16 14:26:24 -08:00
Wächtler, Yannick
484b996879
fixed merge conflicts
2021-12-14 19:48:59 +01:00
snipe
6d84482104
Merge pull request #10388 from snipe/features/switch_to_dusk
...
WIP - Fixing unit tests, switching to dusk
2021-12-06 14:19:36 -08:00
Andrew Roth
d1d3b84f77
Fixed #10365 : Snipe-IT has a wrong total purchase cost when reaches million. Fixed to remove multiple commas in +1M per item.
2021-12-06 13:06:23 -05:00
snipe
d08c1787a1
First steps at getting dusk working
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-30 20:09:29 -08:00
Klaus J. Mueller
a85fa14f9c
fix #10344 and #9135
2021-11-22 17:58:26 +01:00
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
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
