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
3951de1669
Merge branch 'develop' into bug/sc-17129/v6-integration-pie-chart-disappears-if-you
2021-10-28 17:13:37 -07:00
snipe
7e41c74cc3
Updated more fa icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 01:11:08 -07:00
snipe
dbe93d91cd
Updated fontawesome icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 06:07:46 -07:00
Godfrey M
941cba73b9
removed deadspace and unnecessary css changes
2021-09-21 19:27:17 -07:00
Godfrey M
4a0c8de82a
adds jquery eventlistner to monitor chart.js width and refresh accordingly
2021-09-21 19:13:09 -07:00
Godfrey M
a407fe9312
removed more dead space
2021-08-24 15:07:56 -07:00
Godfrey M
53ddf5ae04
removed dead space
2021-08-24 15:07:18 -07:00
Godfrey M
a197b730a1
fixed a layout issue with the month field in depreciations [ch17111]
2021-08-24 15:02:42 -07:00
snipe
dc125af029
Fixed locations link on homepage module
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 19:56:41 -07:00
snipe
2365634139
Added dashboard module for locations [ch9199]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 19:46:56 -07:00
snipe
4af247f845
Added additional boxes to the dashboard
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 16:36:15 -07:00
snipe
8ee9e5e059
Fixed #8537 - wrong sorting on dashboard
2020-10-23 18:33:10 -07:00
snipe
e448b626e2
Removed pagaination from dashboard
2020-09-12 08:37:37 -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
1a5785a8d3
Fixed dashboard header size
2020-04-06 21:30:28 -07:00
snipe
320d660e83
Updated chartjs
2020-04-06 21:17:26 -07:00
snipe
bdddab5b8b
Added role=“option” to option items, additional icon font fixes
2020-04-02 18:17:21 -07:00
snipe
c6c75cc11f
Fixed missing </h3 tags
2020-03-31 23:36:56 -07:00
snipe
bde45cbb34
Fixed h3 to h2 for semantic header levels
2020-03-31 21:30:24 -07:00
snipe
5a6c13e364
Added aria-hidden and sr-only tags to minus/collapse symbol
2020-03-28 01:37:49 -07:00
snipe
41fa2d1aa1
Added aria handlers and sr-only text
2020-03-27 21:44:32 -07:00
Martin Meredith
daf6d98a3b
Remove test data for Pie ( #6793 )
2019-03-08 12:46:47 -08:00
Wes Hulette
3e19509a49
Fixed : #6395 - Adjusted graph size ( #6518 )
...
* Fixed missing oauth tables during setup.
* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop
* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
* Fixed Pie Graph sizing on dashboard
Updated chart.js to 2.7.3
Added height to canvas
2019-01-15 14:02:49 -08:00
Evgeny
dd7db95135
A couple hardcoded strings replaced in according with #6406 ( #6412 )
...
Hardcoded strings was replaced with corresponding placeholders.
Log statuses mentioned in #6406 wasn't translated cause it needs more separate complicated development
2018-11-08 15:20:44 -08:00
snipe
2ded2ff53a
Make dashboard snapshots clickable
2018-10-15 18:19:30 -07:00
Wes Hulette
11f128a84f
Moved chart.js library into vendor.js
2018-09-28 17:28:49 -04:00
Wes Hulette
a865f79d5e
Fixed dashboard tables not showing data ( #6143 )
...
Needed data-pagination="true" set
2018-08-29 12:29:47 -07:00
snipe
7b8362b64c
Added license categories
2018-05-04 21:01:38 -07:00
snipe
c8cf46f62b
Fixed #5431 - category widget error on dashboard
2018-05-01 21:33:03 -07: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
snipe
d86fb098a8
Fixed sort ordering on dashboard
2018-02-02 09:31:43 -06:00
snipe
b3a6ec2804
Fixed #4938 - default sort order
2018-02-01 17:17:56 -06:00
snipe
6eb8acf319
Swich to panel box for dashboard message
2018-01-19 20:49:02 -08:00
snipe
95a9742571
Fixed #4768 - adds dashboard message option to settings
2018-01-19 20:43:55 -08:00
snipe
69a7ea63e2
Pass nopages to dashboard stuff
2018-01-16 07:37:20 -08:00
snipe
dc4472e9e9
Misc export table fixes
2018-01-15 21:03:46 -08:00
snipe
0adebd1ec8
Add sorting and additional category types to dashboard categories
...
BREAKING CHANGE: Category type now reports as `category_type`, instead of `type`
2017-11-21 20:33:30 -08:00
madd15
59c9c22a59
Small UI Changes ( #4404 )
...
* Small ui change to settings nav
* Remove min-height
Removed min-height from Assets by Status
* Add min-height to box-body
2017-11-08 13:12:03 -08:00
snipe
df4cb7d351
Don’t reload the page if the API returns a 500
2017-10-06 18:15:13 -07:00
snipe
46d87849f4
Added content security middleware
2017-09-28 19:45:15 -07:00
snipe
bd02b9ed62
Audit tweaks
2017-08-25 10:18:18 -07:00
snipe
101a09b421
Removed chart (for now)
2017-08-09 19:00:54 -07:00
snipe
6ce2127d75
Fixes incorrect link on dashboard
2017-07-08 13:36:06 -07:00
snipe
d7827fedd9
Fixed dashboard size element
2017-06-06 15:19:19 -07:00
snipe
fbcc40a145
Commented out dashboard chart until proper data provided
2017-06-06 02:51:29 -07:00
snipe
12a7309ecd
Note that the chart doesn’t work, to clear things up
2017-06-06 02:40:50 -07:00
snipe
cc5192c91e
Updated asset url
2017-05-31 13:57:23 -07:00
snipe
66eaff739a
More npm/css/js updates
2017-05-31 12:34:05 -07:00
snipe
748aba3c48
Add assets dashboard feature
...
- also a really broken sample graph
2017-05-31 05:23:54 -07:00
