TagSpaces is an offline, open source, document manager with tagging support
Merge branch 'develop' of https://github.com/tagspaces/tagspaces into develop
Ilian Sapundshievec5d980944f8
diff --cc .prettierignoreindex 1a770ee70,ca4dda41d..490100f32--- a/.prettierignore+++ b/.prettierignore@@@ -1,12 -1,8 +1,12 @@@node_modulesbuildscordova--web/dist++webweb/filesapp/node_modules+app/version.json+flow-typed+app/dist+app/main.prod.jsextensionsdlldiff --cc app/components/CustomLogo.jsindex 0c33d5f51,0c33d5f51..3aa1c58f9--- a/app/components/CustomLogo.js+++ b/app/components/CustomLogo.js@@@ -79,4 -79,4 +79,7 @@@ function mapActionCreatorsToProps(dispa);}--export default connect(undefined, mapActionCreatorsToProps)(CustomLogo);++export default connect(++ undefined,++ mapActionCreatorsToProps++)(CustomLogo);diff --cc app/components/LocationManager.jsindex 8cbde5815,8cbde5815..1d9063667--- a/app/components/LocationManager.js+++ b/app/components/LocationManager.js@@@ -937,5 -937,5 +937,8 @@@ function mapDispatchToProps(dispatch)}export default withStyles(styles)(-- connect(mapStateToProps, mapDispatchToProps)(LocationManager)++ connect(++ mapStateToProps,++ mapDispatchToProps++ )(LocationManager));diff --cc app/components/Search.jsindex 5a1a0a395,5a1a0a395..458e298f3--- a/app/components/Search.js+++ b/app/components/Search.js@@@ -711,5 -711,5 +711,8 @@@ function mapDispatchToProps(dispatch)}export default withStyles(styles)(-- connect(mapStateToProps, mapDispatchToProps)(Search)++ connect(++ mapStateToProps,++ mapDispatchToProps++ )(Search));diff --cc app/components/TagLibrary.jsindex 93f5ad163,93f5ad163..2f20c7710--- a/app/components/TagLibrary.js+++ b/app/components/TagLibrary.js@@@ -444,5 -444,5 +444,8 @@@ function mapDispatchToProps(dispatch)}export default withStyles(styles)(-- connect(mapStateToProps, mapDispatchToProps)(TagLibrary)++ connect(++ mapStateToProps,++ mapDispatchToProps++ )(TagLibrary));diff --cc app/components/TargetFileBox.jsindex abb451b1d,abb451b1d..efc037ff6--- a/app/components/TargetFileBox.js+++ b/app/components/TargetFileBox.js@@@ -79,13 -79,13 +79,9 @@@ const TargetFileBox = (props: Props) =};export default withStyles(styles, { withTheme: true })(-- DropTarget(-- props => props.accepts,-- boxTarget,-- (connect, monitor) => ({-- connectDropTarget: connect.dropTarget(),-- isOver: monitor.isOver(),-- canDrop: monitor.canDrop()-- })-- )(TargetFileBox)++ DropTarget(props => props.accepts, boxTarget, (connect, monitor) => ({++ connectDropTarget: connect.dropTarget(),++ isOver: monitor.isOver(),++ canDrop: monitor.canDrop()++ }))(TargetFileBox));diff --cc app/components/TargetMoveFileBox.jsindex 1c241744f,1c241744f..4086cf491--- a/app/components/TargetMoveFileBox.js+++ b/app/components/TargetMoveFileBox.js@@@ -74,13 -74,13 +74,9 @@@ const TargetMoveFileBox = (props: Props};export default withStyles(styles, { withTheme: true })(-- DropTarget(-- props => props.accepts,-- boxTarget,-- (connect, monitor) => ({-- connectDropTarget: connect.dropTarget(),-- isOver: monitor.isOver(),-- canDrop: monitor.canDrop()-- })-- )(TargetMoveFileBox)++ DropTarget(props => props.accepts, boxTarget, (connect, monitor) => ({++ connectDropTarget: connect.dropTarget(),++ isOver: monitor.isOver(),++ canDrop: monitor.canDrop()++ }))(TargetMoveFileBox));diff --cc app/components/dialogs/EditEntryTagDialog.jsindex cb4e23990,cb4e23990..05d7ec423--- a/app/components/dialogs/EditEntryTagDialog.js+++ b/app/components/dialogs/EditEntryTagDialog.js@@@ -215,6 -215,6 +215,9 @@@ function mapDispatchToProps(dispatch)export default withMobileDialog()(withStyles(styles)(-- connect(mapStateToProps, mapDispatchToProps)(EditEntryTagDialog)++ connect(++ mapStateToProps,++ mapDispatchToProps++ )(EditEntryTagDialog)));diff --cc app/components/dialogs/RenameDirectoryDialog.jsindex 9184197a1,9184197a1..a93040078--- a/app/components/dialogs/RenameDirectoryDialog.js+++ b/app/components/dialogs/RenameDirectoryDialog.js@@@ -146,4 -146,4 +146,7 @@@ function mapActionCreatorsToProps(dispa);}--export default connect(null, mapActionCreatorsToProps)(RenameDirectoryDialog);++export default connect(++ null,++ mapActionCreatorsToProps++)(RenameDirectoryDialog);diff --cc app/components/menus/DirectoryMenu.jsindex 81abe246a,81abe246a..7d8ffa288--- a/app/components/menus/DirectoryMenu.js+++ b/app/components/menus/DirectoryMenu.js@@@ -479,4 -479,4 +479,7 @@@ function mapDispatchToProps(dispatch));}--export default connect(null, mapDispatchToProps)(DirectoryMenu);++export default connect(++ null,++ mapDispatchToProps++)(DirectoryMenu);diff --cc app/components/menus/EntryTagMenu.jsindex 5d30b3e88,5d30b3e88..62fb7d462--- a/app/components/menus/EntryTagMenu.js+++ b/app/components/menus/EntryTagMenu.js@@@ -150,4 -150,4 +150,7 @@@ function mapDispatchToProps(dispatch));}--export default connect(mapStateToProps, mapDispatchToProps)(EntryTagMenu);++export default connect(++ mapStateToProps,++ mapDispatchToProps++)(EntryTagMenu);diff --cc app/components/menus/TagMenu.jsindex 590e6a0d9,590e6a0d9..431458f85--- a/app/components/menus/TagMenu.js+++ b/app/components/menus/TagMenu.js@@@ -164,4 -164,4 +164,7 @@@ function mapDispatchToProps(dispatch));}--export default connect(mapStateToProps, mapDispatchToProps)(TagLibraryMenu);++export default connect(++ mapStateToProps,++ mapDispatchToProps++)(TagLibraryMenu);diff --cc app/reducers/settings.jsindex 2672cbced,2672cbced..c60cfc99d--- a/app/reducers/settings.js+++ b/app/reducers/settings.js@@@ -73,22 -73,22 +73,13 @@@ export default (state = defaultSettingsswitch (action.type) {case types.UPGRADE_SETTINGS: {const mergedKeyBindings = defaultSettings.keyBindings.map(x =>-- Object.assign(-- x,-- state.keyBindings.find(y => y.name === x.name)-- )++ Object.assign(x, state.keyBindings.find(y => y.name === x.name)));const mergedFileTypes = defaultSettings.supportedFileTypes.map(x =>-- Object.assign(-- x,-- state.supportedFileTypes.find(y => y.type === x.type)-- )++ Object.assign(x, state.supportedFileTypes.find(y => y.type === x.type)));const combinedFileTypes = state.supportedFileTypes.map(x =>-- Object.assign(-- x,-- mergedFileTypes.find(y => y.type === x.type)-- )++ Object.assign(x, mergedFileTypes.find(y => y.type === x.type)));return {...defaultSettings,diff --cc package.jsonindex 7da1153db,309f98755..3b6f2915c--- a/package.json+++ b/package.json@@@ -165,10 -160,10 +165,10 @@@"extract-text-webpack-plugin": "^v4.0.0-beta.0","fbjs-scripts": "^1.2.0","file-loader": "^3.0.1",- "flow-bin": "^0.109.0",+ "flow-bin": "^0.114.0","flow-runtime": "^0.17.0",- "flow-typed": "^2.6.1",+ "flow-typed": "^2.6.2",- "husky": "^1.3.1",+ "husky": "^3.1.0","identity-obj-proxy": "^3.0.0","jest": "^24.9.0","jsDAV": "~0.3.4",