Skip to content

Commit

Permalink
Merge pull request #42 from lbragile/settings
Browse files Browse the repository at this point in the history
feat(settings): add global settings menu
  • Loading branch information
lbragile authored Jan 26, 2022
2 parents 816a856 + 32bcf81 commit b51afba
Show file tree
Hide file tree
Showing 73 changed files with 3,039 additions and 1,638 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- markdownlint-disable-next-line MD033 MD041 -->
<div align="center">

![tabmerger logo](./public/images/logo-full-rescale.PNG)
![tabmerger logo](https://raw.githubusercontent.com/lbragile/TabMerger/master/public/images/logo-full.png)

[![Build][build status]](https://github.com/lbragile/TabMerger/actions) [![Forks][gh forks]](https://github.com/lbragile/TabMerger/network/members) [![Stars][gh stars]](https://github.com/lbragile/TabMerger/stargazers) [![Watchers][gh watchers]](https://github.com/lbragile/TabMerger/watchers) [![Release][release]](https://github.com/lbragile/TabMerger/releases/tag/v2.0.0) [![License][license]](https://github.com/lbragile/TabMerger/blob/master/LICENSE.md)
\
Expand Down
1 change: 1 addition & 0 deletions config/.cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"Sitnik",
"Stoiber",
"TABMERGER",
"uniquify",
"Vitaly",
"webextensions",
"Zalavadiya"
Expand Down
2 changes: 1 addition & 1 deletion config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = {
{
from: "public",
globOptions: {
ignore: ["**/logo-full-rescale.PNG"]
ignore: ["**/logo-full.png"]
}
}
]
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
"private": true,
"dependencies": {
"file-saver": "^2.0.5",
"nanoid": "^3.1.32",
"nanoid": "^3.2.0",
"react": "^17.0.2",
"react-beautiful-dnd": "^13.1.0",
"react-dom": "^17.0.2",
"react-dropzone": "^11.5.1",
"react-multi-select-component": "^4.1.15"
},
"devDependencies": {
"@babel/core": "^7.16.7",
"@babel/preset-env": "^7.16.8",
"@babel/core": "^7.16.10",
"@babel/preset-env": "^7.16.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@commitlint/cli": "^16.0.2",
"@commitlint/cli": "^16.0.3",
"@commitlint/config-conventional": "^16.0.0",
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-regular-svg-icons": "^5.15.4",
Expand All @@ -28,21 +28,21 @@
"@types/chrome": "^0.0.176",
"@types/express": "^4.17.13",
"@types/file-saver": "^2.0.5",
"@types/node": "^17.0.8",
"@types/node": "^17.0.10",
"@types/react": "^17.0.38",
"@types/react-beautiful-dnd": "^13.1.2",
"@types/react-dom": "^17.0.11",
"@types/styled-components": "^5.1.20",
"@typescript-eslint/eslint-plugin": "^5.9.1",
"@typescript-eslint/parser": "^5.9.1",
"@typescript-eslint/eslint-plugin": "^5.10.0",
"@typescript-eslint/parser": "^5.10.0",
"babel-loader": "^8.2.3",
"babel-plugin-styled-components": "^2.0.2",
"copy-webpack-plugin": "^10.2.0",
"cross-env": "^7.0.3",
"cspell": "^5.15.2",
"danger": "^10.8.0",
"dotenv-webpack": "^7.0.3",
"eslint": "^8.6.0",
"eslint": "^8.7.0",
"eslint-import-resolver-typescript": "^2.5.0",
"eslint-plugin-import": "2.25.4",
"eslint-plugin-jsx-a11y": "^6.5.1",
Expand Down
Loading

0 comments on commit b51afba

Please sign in to comment.