Skip to content

Commit c7f736f

Browse files
dvorkadvorka
committed
Merge branch 'master' into dev/2.1.0
2 parents c0df9a5 + da178e5 commit c7f736f

505 files changed

Lines changed: 527 additions & 527 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.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

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎app/app.pro‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# app.pro Qt project file for MindForger Qt-based frontend
22
#
3-
# Copyright (C) 2016-2024 Martin Dvorak <martin.dvorak@mindforger.com>
3+
# Copyright (C) 2016-2025 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
@@ -192,9 +192,9 @@ INCLUDEPATH += ./src/qt/spelling
192192
#
193193
win32{
194194
QMAKE_CXXFLAGS += /MP
195-
195+
196196
# DISABLED ccache as it causes compilation error:
197-
# "C1090: PDB API call failed, error code '23'" when used
197+
# "C1090: PDB API call failed, error code '23'" when used
198198
# when used w/ MS VS compiler:
199199
# !mfnoccache { QMAKE_CXX = ccache $$QMAKE_CXX }
200200
} else {

‎app/src/qt/assoc_leaderboard_model.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
assoc_leaderboard_model.cpp MindForger thinking notebook
33
4-
Copyright (C) 2016-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
77
modify it under the terms of the GNU General Public License

‎app/src/qt/assoc_leaderboard_model.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
assoc_leaderboard_model.h MindForger thinking notebook
33
4-
Copyright (C) 2016-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
77
modify it under the terms of the GNU General Public License

‎app/src/qt/assoc_leaderboard_presenter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
assoc_leaderboard_presenter.cpp MindForger thinking notebook
33
4-
Copyright (C) 2016-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
77
modify it under the terms of the GNU General Public License

‎app/src/qt/assoc_leaderboard_presenter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
assoc_leaderboard_presenter.h MindForger thinking notebook
33
4-
Copyright (C) 2016-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
77
modify it under the terms of the GNU General Public License

‎app/src/qt/assoc_leaderboard_view.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
assoc_leaderboard_view.cpp MindForger thinking notebook
33
4-
Copyright (C) 2016-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
77
modify it under the terms of the GNU General Public License

‎app/src/qt/assoc_leaderboard_view.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
assoc_leaderboard_view.h MindForger thinking notebook
33
4-
Copyright (C) 2016-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
77
modify it under the terms of the GNU General Public License

0 commit comments

Comments
 (0)