Skip to content

Commit 526ea49

Browse files
committed
Merge branch 'dev/2.1.0' into enh-1539/ollama-llm-choice
2 parents bc0f72e + c7f736f commit 526ea49

11 files changed

Lines changed: 12 additions & 11 deletions

File tree

.github/workflows/build_macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
run: cd deps/cmark-gfm && mkdir -v build && cd build && cmake -DCMARK_TESTS=OFF -DCMARK_SHARED=OFF .. && cmake --build .
2121

2222
- name: Run QMake
23-
run: pwd ; qmake -r "CONFIG+=mfci" mindforger.pro
23+
run: pwd ; qmake -r "CONFIG+=mfci" mindforger.pro
2424

2525
- name: Run Make
2626
run: make -j 4
@@ -29,7 +29,7 @@ jobs:
2929
run: cd build/macos && ./dmg-package-build.sh ci
3030

3131
- name: Archive push build artifacts
32-
uses: actions/upload-artifact@v2
32+
uses: actions/upload-artifact@v4
3333
with:
3434
name: macos-ci-build
3535
path: app/*.dmg

.github/workflows/build_ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: mkdir -v ../work-tarball && cp -vf build/tarball/tarball-build.sh ../work-tarball && cd ../work-tarball && ./tarball-build.sh ci
3333

3434
- name: Archive push build artifacts
35-
uses: actions/upload-artifact@v2
35+
uses: actions/upload-artifact@v4
3636
with:
3737
name: tarball-ci-build
3838
path: /home/runner/work/mindforger/work-tarball/*.tgz

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ deps/mitie
2727
deps/cmark-gfm
2828
snapcraft.yaml
2929
*.snap
30+
.qtc_clangd/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ MindForger is human mind inspired personal knowledge management tool.
2929
MindForger is open, free, well performing Markdown editor / IDE which respects your privacy.
3030

3131
## Features
32-
MindForger **features overview**: [open](https://github.com/dvorka/mindforger?tab=GPL-2.0-1-ov-file#readme), [free](https://www.mindforger.com/#floss), [OpenAI GPT integrated](https://www.mindforger.com/#llm), knowledge manager, Markdown editor (math, diagrams, images, table of contents generator), [outliner](https://www.youtube.com/watch?v=LUqavHfKhnc&list=PLkTlgXXVRbUDdvysdslnAt_mU15oNPWNS&index=4), spell-check, [Markdown IDE](https://www.mindforger.com/#features) (multi-document workspace, section refactoring, cloning, scopes and stencils), [organizer](https://www.youtube.com/watch?v=Tje2mso7jNY&list=PLkTlgXXVRbUDdvysdslnAt_mU15oNPWNS&index=11) (Eisenhower matrix, Kanban), [knowledge graph navigator](https://www.youtube.com/watch?v=ZbQmZ1fKpxI&list=PLkTlgXXVRbUDdvysdslnAt_mU15oNPWNS&index=14), knowledge autolinking, think as you browse, think as you write, find by name/tag/text/regexp, find similar sections (associations), tagging, emojis, checklists, recent sections, [external section editor](https://www.youtube.com/watch?v=SLuvfDRyUrM&list=PLkTlgXXVRbUDdvysdslnAt_mU15oNPWNS&index=12), themes, internationalization, export (CSV with OHE for machine learning, HTML) and import (TWiki).
32+
MindForger **features overview**: [open](https://github.com/dvorka/mindforger?tab=GPL-2.0-1-ov-file#readme), [free](https://www.mindforger.com/#floss), <!-- [OpenAI GPT integrated](https://www.mindforger.com/#llm), --> knowledge manager, Markdown editor (math, diagrams, images, table of contents generator), [outliner](https://www.youtube.com/watch?v=LUqavHfKhnc&list=PLkTlgXXVRbUDdvysdslnAt_mU15oNPWNS&index=4), spell-check, [Markdown IDE](https://www.mindforger.com/#features) (multi-document workspace, section refactoring, cloning, scopes and stencils), [organizer](https://www.youtube.com/watch?v=Tje2mso7jNY&list=PLkTlgXXVRbUDdvysdslnAt_mU15oNPWNS&index=11) (Eisenhower matrix, Kanban), [knowledge graph navigator](https://www.youtube.com/watch?v=ZbQmZ1fKpxI&list=PLkTlgXXVRbUDdvysdslnAt_mU15oNPWNS&index=14), knowledge autolinking, think as you browse, think as you write, find by name/tag/text/regexp, find similar sections (associations), tagging, emojis, checklists, recent sections, [external section editor](https://www.youtube.com/watch?v=SLuvfDRyUrM&list=PLkTlgXXVRbUDdvysdslnAt_mU15oNPWNS&index=12), themes, internationalization, export (CSV with OHE for machine learning, HTML) and import (TWiki).
3333

3434
## Installation
3535
Install:

app/src/qt/spelling/dictionary_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/***********************************************************************
22
*
33
* Copyright (C) 2009, 2010, 2011, 2012, 2013 Graeme Gott <graeme@gottcode.org>
4-
* Copyright (C) 2021-2024 Martin Dvorak <martin.dvorak@mindforger.com>
4+
* Copyright (C) 2016-2025 Martin Dvorak <martin.dvorak@mindforger.com>
55
*
66
* This program is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License as published by

app/src/qt/spelling/dictionary_manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/***********************************************************************
22
*
33
* Copyright (C) 2009, 2010, 2011, 2012, 2013 Graeme Gott <graeme@gottcode.org>
4-
* Copyright (C) 2021-2024 Martin Dvorak <martin.dvorak@mindforger.com>
4+
* Copyright (C) 2016-2025 Martin Dvorak <martin.dvorak@mindforger.com>
55
*
66
* This program is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License as published by

app/src/qt/spelling/dictionary_provider_hunspell.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* Copyright (C) 2009, 2010, 2011, 2012, 2013 Graeme Gott <graeme@gottcode.org>
44
* Copyright (C) 2014-2020 wereturtle
5-
* Copyright (C) 2021-2024 Martin Dvorak <martin.dvorak@mindforger.com>
5+
* Copyright (C) 2016-2025 Martin Dvorak <martin.dvorak@mindforger.com>
66
*
77
* This program is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License as published by

build/debian/debian/copyright

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Upstream-Name: mindforger
33
Source: https://github.com/dvorka/mindforger
44

55
Files: debian/*
6-
Copyright: 2016-2024 Martin Dvorak <martin.dvorak@mindforger.com>
6+
Copyright: 2016-2026 Martin Dvorak <martin.dvorak@mindforger.com>
77
License: GPL-2+
88
MindForger is licensed under GNU GPL version 2 or any later version.
99
.

build/travis-ci/.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# .travis.yml Travis CI configuration file for MindForger
22
#
3-
# Copyright (C) 2014-2024 Martin Dvorak <martin.dvorak@mindforger.com>
3+
# Copyright (C) 2016-2026 Martin Dvorak <martin.dvorak@mindforger.com>
44
#
55
# This program is free software; you can redistribute it and/or
66
# modify it under the terms of the GNU General Public License

build/ubuntu/debian/copyright

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Upstream-Name: mindforger
33
Source: https://github.com/dvorka/mindforger
44

55
Files: debian/*
6-
Copyright: 2016-2024 Martin Dvorak <martin.dvorak@mindforger.com>
6+
Copyright: 2016-2026 Martin Dvorak <martin.dvorak@mindforger.com>
77
License: GPL-2+
88
MindForger is licensed under GNU GPL version 2 or any later version.
99
.

0 commit comments

Comments
 (0)