Commits · master · Education / Cantor

05 Aug, 2020 2 commits
- Merge branch 'master' of invent.kde.org:education/cantor · d90c425c
  Christoph Feck authored Aug 05, 2020
  
  d90c425c
- GIT_SILENT Update Appstream for new release · 58705b2c
  Christoph Feck authored Aug 05, 2020
```
(cherry picked from commit 7948dbc8)
```
  58705b2c
01 Aug, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7d820960

Script Kiddy authored Aug 01, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

7d820960

31 Jul, 2020 2 commits
- Use the range based for-loop instead of foreach, more usage of the · d60a4d48
  Alexander Semke authored Jul 31, 2020
```
'auto' keyword and others minor code style fixes in cantor.cpp.
```
  d60a4d48
- Avoided duplicated looping over the plugin pathes and some minor code · f58c723c
  Alexander Semke authored Jul 31, 2020
```
style fixes in the panel plugin handler.
```
  f58c723c
28 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d6766567

Script Kiddy authored Jul 28, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

d6766567

27 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 61489b88

Script Kiddy authored Jul 27, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

61489b88

26 Jul, 2020 4 commits
- GIT_SILENT made messages (after extraction) · 30cbff2c
  Script Kiddy authored Jul 27, 2020
  
  30cbff2c
- Fix dock panels tabification when Cantor load file · 10858f7a
  Nikita Sirgienko authored Jul 26, 2020
  
  10858f7a
- Minor CMake fix · e2deaf03
  Nikita Sirgienko authored Jul 26, 2020
  
  e2deaf03
- Export Cantor::PluginPanel and Cantor::PluginPanelHandler and minor improvments · 5061feb2
  Nikita Sirgienko authored Jul 26, 2020
  
  5061feb2
25 Jul, 2020 2 commits
- Increase soversion due ABI changes · 292da13a
  Nikita Sirgienko authored Jul 25, 2020
  
  292da13a
- [GSoC 2020] move some code from CantorShell to PanelPluginHandler · 6f96a001
  Nikita Sirgienko authored Jul 25, 2020
  
  6f96a001
22 Jul, 2020 2 commits

Fix compilation after 09dc3d44 · 4d97fc8d
Nikita Sirgienko authored Jul 22, 2020

4d97fc8d

[GSoC 2020] Increase Cantor Plugins Performance · 09dc3d44

Nikita Sirgienko authored Jul 22, 2020

Now all panels belongs to CantorShell instead of Cantor Part, so now there is only one instance of each Panel in Cantor.
The changing of Panels content during Worksheets changes will be done via new methods: saveState, restoreState.

09dc3d44

19 Jul, 2020 1 commit

[GSoC 2020] Fix bug with loading panel states for each backends between... · 94e968ff

Nikita Sirgienko authored Jul 20, 2020

[GSoC 2020] Fix bug with loading panel states for each backends between program runs - restoring state while loading now works correct

94e968ff

16 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 132ed29d

Script Kiddy authored Jul 16, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

132ed29d

15 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 86a308b3

Script Kiddy authored Jul 15, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

86a308b3

14 Jul, 2020 4 commits
- Add text message for 51f0cb08 · 9bb6fc0e
  Nikita Sirgienko authored Jul 15, 2020
  
  9bb6fc0e
- Disable double opening files inside Cantor. Now, if user try to open... · 51f0cb08
  Nikita Sirgienko authored Jul 14, 2020
```
Disable double opening files inside Cantor. Now, if user try to open worksheet, which already opened, Cantor just activate tab with the worksheet
```
  51f0cb08
- [GSoC 2020] Extend the functional of FileBrowserPanel - add file filter option · 9d36066d
  Nikita Sirgienko authored Jul 14, 2020
  
  9d36066d
- SVN_SILENT made messages (.desktop file) - always resolve ours · ffc04a05
  Script Kiddy authored Jul 14, 2020
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  ffc04a05
13 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · fc9bfdb7

Script Kiddy authored Jul 13, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

fc9bfdb7

12 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 82458565

Script Kiddy authored Jul 12, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

82458565

11 Jul, 2020 2 commits
- [GSoC 2020] Extend features of FileBrowserPanel · 3d2c5e1f
  Nikita Sirgienko authored Jul 11, 2020
  
  3d2c5e1f
- GIT_SILENT Upgrade release service version to 20.11.70. · b1cddf1c
  Albert Astals Cid authored Jul 11, 2020
  
  b1cddf1c
10 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 43b7329b

Script Kiddy authored Jul 10, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

43b7329b

09 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · f9f632a5

Script Kiddy authored Jul 09, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

f9f632a5

07 Jul, 2020 5 commits
- Add backward compability code to load image entries · bf3f6a09
  Filipe Saraiva authored Jul 01, 2020
```
files from the worksheet file
```
  bf3f6a09
- Load the image entries of Cantor worksheet file format · 4bba01ba
  Filipe Saraiva authored Jun 30, 2020
  
  4bba01ba
- Store the image entries of Cantor in worksheet file format · 3e44e3ab
  Filipe Saraiva authored Jun 30, 2020
  
  3e44e3ab
- [Julia] Improve graphicPackageErrorMessage for GR · 334cf772
  Nikita Sirgienko authored Jul 07, 2020
  
  334cf772
- SVN_SILENT made messages (.desktop file) - always resolve ours · 3c9956b4
  Script Kiddy authored Jul 07, 2020
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  3c9956b4
06 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4b1ff759

Script Kiddy authored Jul 06, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

4b1ff759

05 Jul, 2020 4 commits
- [GSoC 2020] Add File Browser panel and two major bugfixes in Cantor Shell: bug... · e1ee8d1f
  Nikita Sirgienko authored Jul 05, 2020
```
[GSoC 2020] Add File Browser panel and two major bugfixes in Cantor Shell: bug with saving panel state and wrong logic of closing tabs
```
  e1ee8d1f
- Merge remote-tracking branch 'origin/release/20.04' · e3881ab8
  Luigi Toscano authored Jul 05, 2020
  
  e3881ab8
- Use the canonical docs.kde.org URLs · 30eadb60
  Luigi Toscano authored Jul 05, 2020
  
  30eadb60
- GIT_SILENT [Octave] Minor cmake fix · 5c719479
  Nikita Sirgienko authored Jul 05, 2020
  
  5c719479
04 Jul, 2020 1 commit
- [GSoC 2020] Store panel states for each backends between program runs · b60dce3e
  Nikita Sirgienko authored Jul 04, 2020
  
  b60dce3e
03 Jul, 2020 1 commit
- GIT_SILENT Update Appstream for new release · aae4bae4
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit cf99f2af)
```
  aae4bae4