snipe
43c57c8461
Merge master into develop
...
Signed-off-by: snipe <[email protected] >
# 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
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
snipe
8be6d10dbe
Fixed #10467 - Safari only font-awesome bug
...
Signed-off-by: snipe <[email protected] >
2021-12-24 12:30:34 -08:00
snipe
f4ef828332
Fixex js table export
...
Signed-off-by: snipe <[email protected] >
2021-12-24 11:17:36 -08:00
snipe
312200bf44
Removed duplicate "department" entry in importer, pulls #10460 to master
...
Signed-off-by: snipe <[email protected] >
2021-12-21 13:37:20 -08:00
snipe
174d23a42a
Updated assets
...
Signed-off-by: snipe <[email protected] >
2021-11-15 19:29:57 -08:00
snipe
fba0e2b712
Revert tableexport
...
(It broke the npm run prod build)
Signed-off-by: snipe <[email protected] >
2021-11-03 16:17:19 -07:00
snipe
12df310449
Updated assets
...
Signed-off-by: snipe <[email protected] >
2021-09-24 02:16:58 -07:00
snipe
d069d032fc
Updated JS asset
...
Signed-off-by: snipe <[email protected] >
2021-09-23 18:59:13 -07:00
snipe
11d9b1ba45
Updated assets
...
Signed-off-by: snipe <[email protected] >
2021-07-06 15:09:03 -07:00
Brady Wetherington
dce1dd41c8
Regenerate assets after repairing Vue integration
2021-06-28 16:38:05 -07:00
Godfrey M
f199098a59
undid the color change for links, darkened the back-sub-alt
2021-06-23 16:29:21 -07:00
snipe
ce1d3284b0
Buld assets
...
Signed-off-by: snipe <[email protected] >
2021-04-14 10:12:14 -07:00
Brady Wetherington
6b86e2a58f
Rebuilt all assets after all commits had landed
2021-04-06 20:16:59 -07:00
snipe
3f01b02fd9
Updated BS tables
2021-03-02 12:33:29 -08:00
Godfrey Martinez
55a526a6b3
corrected background color for bulk checkout listable items in all da… ( #8916 )
...
* corrected background color for bulk checkout listable items in all dark schemas
* resubmitting
2020-12-15 12:37:22 -08:00
snipe
1090b291c3
Updated node packages, reregnerated assets
2020-10-19 16:56:59 -07:00
snipe
b433b49469
Ficing webpack, CSS and JS (*whew* that sucked)
...
Signed-off-by: snipe <[email protected] >
2020-04-27 22:41:33 -07:00
snipe
72a1616b3c
Removed wonky assets
...
Signed-off-by: snipe <[email protected] >
2020-04-27 21:02:42 -07:00
snipe
756361584a
Updated assets
2019-08-14 22:22:33 -07:00
snipe
3b525f0009
Fixed #6705 - undefined is not a function (near '...$.validate...')
...
Not sure what happened here, but re-running webpack seems to have resolved it.
2019-02-13 05:16:12 -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
Wes Hulette
465b69516d
Fixed : #6259 - Remove remote JS/CSS file loading ( #6330 )
...
* Fixed missing oauth tables during setup.
* Remove remote JS/CSS file loading
Updated gravatar to return to default image
* Updated default avatar path to user url
Removed local html5shim & response js files.
Removed copying html5shim & respond js file to public directory
2018-10-17 12:52:01 -07:00
snipe
dff674b4ab
Production assets
2018-10-09 16:12:43 -07: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
c8ad45b11e
Port import manager code to develop
2018-10-03 00:52:29 -07:00
Wes Hulette
fc8096f8dc
Fixed: Missing CSS file in basic.blade.php ( #6264 )
...
* Fixed missing CSS file in basic.blade.php
* Added
* Changed stylesheet import for authorize.blade.php
2018-09-29 14:15:25 -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
