Merge branch 'dev' of github.com:laurent22/joplin into dev

.github/stale.yml

@@ -9,7 +9,7 @@ exemptLabels:
   - "upstream"
   - "backlog"
   - "high"
-  - "full-spec"
+  - "spec"
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable

ElectronClient/plugins/GotoAnything.jsx

@@ -227,7 +227,7 @@ class Dialog extends React.PureComponent {
 				} else {
 					const limit = 20;
 					const searchKeywords = this.keywords(searchQuery);
-					const notes = await Note.byIds(results.map(result => result.id).slice(0, limit), { fields: ['id', 'body', 'markup_language'] });
+					const notes = await Note.byIds(results.map(result => result.id).slice(0, limit), { fields: ['id', 'body', 'markup_language', 'is_todo', 'todo_completed'] });
 					const notesById = notes.reduce((obj, { id, body, markup_language }) => ((obj[[id]] = { id, body, markup_language }), obj), {});
 
 					for (let i = 0; i < results.length; i++) {
@@ -269,6 +269,10 @@ class Dialog extends React.PureComponent {
 							results[i] = Object.assign({}, row, { path: path, fragments: '' });
 						}
 					}
+
+					if (!this.props.showCompletedTodos) {
+						results = results.filter((row) => !row.is_todo || !row.todo_completed);
+					}
 				}
 			}
 
@@ -449,6 +453,7 @@ const mapStateToProps = (state) => {
 	return {
 		folders: state.folders,
 		theme: state.settings.theme,
+		showCompletedTodos: state.settings.showCompletedTodos,
 	};
 };