DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 07:47:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
7513 commits 89 branches 265 tags 290 MiB
Commit graph

37 commits

Author SHA1 Message Date
snipe 54d6a4d978 Fixed #10825 - selectlists in modals b0rked 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 08:23:50 -07:00
Godfrey M 708dc08b4f mixes color contrast on dropdown menu from navbar 
on file
 2022-03-03 09:27:52 -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
snipe 303fc39966 Regenerated assets to pikc up #10089 changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-11 14:38:17 -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 f4ef828332 Fixex js table export 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-24 11:17:36 -08:00
snipe 312200bf44 Removed duplicate "department" entry in importer, pulls #10460 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-21 13:37:20 -08:00
snipe 174d23a42a Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:29:57 -08:00
snyk-bot 4839b0e008
fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-BOOTSTRAPTABLE-1657597
 2021-11-13 05:19:33 +00:00
snipe 05c6254fdc Updated snipeit.js with "restore" modal code 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-09 22:39:33 -08:00
snipe fba0e2b712 Revert tableexport 
(It broke the npm run prod build)

Signed-off-by: snipe <snipe@snipe.net>
 2021-11-03 16:17:19 -07:00
snipe 608c2f91a8 Updated package lock 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-03 16:04:48 -07:00
snipe 7470fdb605
Merge pull request #9912 from snipe/snyk-upgrade-1377cc2d38a76585c814757398543f5f 
[Snyk] Upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26
 2021-10-28 17:15:10 -07:00
snipe 930e220cf1
Merge pull request #9915 from snipe/snyk-upgrade-b2b26cf8ec7a697fe0094f699652a345 
[Snyk] Upgrade bootstrap-table from 1.18.2 to 1.18.3
 2021-10-28 17:12:47 -07:00
snyk-bot dfde50732b
fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-JQUERYUI-1767167
- https://snyk.io/vuln/SNYK-JS-JQUERYUI-1767175
- https://snyk.io/vuln/SNYK-JS-JQUERYUI-1767767
 2021-10-28 07:28:38 +00:00
snipe f306401e7e Fixed SVG XSS vuln 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-06 12:26:45 -07:00
snipe dbe93d91cd Updated fontawesome icons 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 06:07:46 -07:00
snipe d82490f4a6 Updated package-lock 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-23 19:05:41 -07:00
snipe f8562e5835 Recompiled assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 00:45:02 -07:00
Godfrey M 01037cf9cb initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358] 2021-08-10 18:26:43 -07:00
snyk-bot 3fedcc6766
fix: upgrade bootstrap-table from 1.18.2 to 1.18.3 
Snyk has created this PR to upgrade bootstrap-table from 1.18.2 to 1.18.3.

See this package in npm:
https://www.npmjs.com/package/bootstrap-table

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=upgrade-pr
 2021-08-07 21:41:02 +00:00
snyk-bot 892ae9cf91
fix: upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26 
Snyk has created this PR to upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26.

See this package in npm:
https://www.npmjs.com/package/tableexport.jquery.plugin

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=upgrade-pr
 2021-08-07 21:40:51 +00:00
Godfrey M aba912001d Table striping on dark mode skins is too [ch16594] 2021-06-28 20:41:56 -07:00
Godfrey M f199098a59 undid the color change for links, darkened the back-sub-alt 2021-06-23 16:29:21 -07:00
dependabot[bot] da79a16284
Bump ssri from 6.0.1 to 6.0.2 (#9459) 
* Removed printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer"

Signed-off-by: snipe <snipe@snipe.net>

* Bump ssri from 6.0.1 to 6.0.2

Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: snipe <snipe@snipe.net>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-20 21:13:34 -07:00
Brady Wetherington 6b86e2a58f Rebuilt all assets after all commits had landed 2021-04-06 20:16:59 -07:00
Joel Pittet af8509c4d0
Allow NPM packages to build for production (#9171) 
* add back changes before compiling assets

* new css location and mix manifest

* update papaparse, most vunerabilities attached to it

* update axios and papaparse for security releases

* removing security fixes that still allow npm run production to work

* Update lodash
 2021-04-05 22:01:11 -07:00
Brady Wetherington 9a224a07ba
Modified how we do Select2 dynamic drop-down menus to be more secure (#9079) 
* Modified how we do Select2 dynamic drop-down menus to be more secure

As noted by the author of select2, the more-secure way of creating
rich Select-dropdowns is to use jquery to create HTML snippets and
carefully modify text attributes within there. This prevents any
XSS from being brought to the page. As a side-effect, the extra
escaping that we had to do in all of the internal selectlist calls
is now no longer necessary, and has been removed. Rebased and
squashed from the original.

* Rebuilt all assets, but this still feels like it's too much stuff in here.

* Whoops, need to run that in dev, not prod
 2021-02-02 15:55:21 -08:00
snipe f9dcf0783a Added phantomjs to package.json 2020-11-28 16:58:02 -08:00
snipe d317052ede Updated CSS assets with green skin edits 2020-10-23 18:55:00 -07:00
snipe 1090b291c3 Updated node packages, reregnerated assets 2020-10-19 16:56:59 -07:00
Brady Wetherington 318da67230 Fix Select2 'infinite scroll' drop-downs for Snipe-IT v5 2020-07-13 17:43:15 -07:00
snipe e9135eceb3
Better json formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 11:16:31 -07:00
snipe eb8c20880a
Updated package.json 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:12:12 -07:00
snipe 63259418b2
Package updates 2020-04-21 10:43:25 -07:00
Brady Wetherington 44bb79c90e Fix to lockfile, update to package.json to non-vuln versions (#5460) 2018-05-01 21:01:45 -07:00
snipe a6cc31944a Added package-lock 2018-03-02 19:17:01 -08:00