Commits · cf99f2af7e994fa610c9ad5a2f7457acb7213e4f · Education / Cantor

03 Jul, 2020 2 commits
- GIT_SILENT Update Appstream for new release · cf99f2af
  Christoph Feck authored Jul 03, 2020
  
  cf99f2af
- GIT_SILENT Upgrade release service version to 20.04.3. · dceb8efc
  Christoph Feck authored Jul 03, 2020
  
  dceb8efc
18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5674e836
  Script Kiddy authored Jun 18, 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"
```
  5674e836
- GIT_SILENT made messages (after extraction) · 6ba75b87
  Script Kiddy authored Jun 18, 2020
  
  6ba75b87
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · b8ee07b6
  Script Kiddy authored Jun 17, 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"
```
  b8ee07b6
- GIT_SILENT made messages (after extraction) · ec9af369
  Script Kiddy authored Jun 17, 2020
  
  ec9af369
11 Jun, 2020 1 commit

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

Script Kiddy authored Jun 11, 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"

10997323

09 Jun, 2020 1 commit

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

Script Kiddy authored Jun 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"

6ba841bb

08 Jun, 2020 2 commits
- GIT_SILENT Update Appstream for new release · cc4a410d
  Christoph Feck authored Jun 08, 2020
  
  cc4a410d
- GIT_SILENT Upgrade release service version to 20.04.2. · ee59f828
  Christoph Feck authored Jun 08, 2020
  
  ee59f828
04 Jun, 2020 1 commit

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

Script Kiddy authored Jun 04, 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"

676fd9d6

25 May, 2020 2 commits
- Fix bug with converting EpsResult to Jupyter notebook format (.ipynb) · 0b1e6e89
  Nikita Sirgienko authored May 25, 2020
  
  0b1e6e89
- Fix bug (missing metadata) with converting EpsResult to Jupyter .ipynb format · 557757a7
  Nikita Sirgienko authored May 25, 2020
  
  557757a7
11 May, 2020 11 commits
- GIT_SILENT Update Appstream for new release · dd9fd814
  Christoph Feck authored May 11, 2020
  
  dd9fd814
- GIT_SILENT Upgrade release service version to 20.04.1. · 8a53df32
  Christoph Feck authored May 11, 2020
  
  8a53df32
- Merge branch 'default_options_commandentry_formatting' into 'release/20.04' · 5d13dd36
  Alexander Semke authored May 11, 2020
```
Default options for Command Entry formatting

See merge request kde/cantor!14
```
  5d13dd36
- Merge branch 'release/20.04' into 'default_options_commandentry_formatting' · cbc6d635
  Alexander Semke authored May 11, 2020
```
# Conflicts:
#   src/commandentry.cpp
```
  cbc6d635
- [Julia] Remove eps option from settings menu too · 153bcdc2
  Nikita Sirgienko authored May 11, 2020
  
  153bcdc2
- [Julia] Disable possibility set eps as plot output extension, because it isn't work at all · abbdb051
  Nikita Sirgienko authored May 11, 2020
  
  abbdb051
- [Julia] Fix bug with missing plots in the saved worksheet · 611c50ef
  Nikita Sirgienko authored May 11, 2020
  
  611c50ef
- [Octave] Change graphics toolkit only if currect toolkit is "fltk". This is... · bb62b071
  Nikita Sirgienko authored May 11, 2020
```
[Octave] Change graphics toolkit only if currect toolkit is "fltk". This is needed for preventing problem with modern octave versions (5.0.0+), some of which have "qt" toolkit as default.
```
  bb62b071
- Set proper values for bold/italic font checkbox in CommandEntry · fe60f154
  Nikita Sirgienko authored May 11, 2020
  
  fe60f154
- SVN_SILENT made messages (.desktop file) - always resolve ours · d18779aa
  Script Kiddy authored May 11, 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"
```
  d18779aa
- GIT_SILENT made messages (after extraction) · e8fe530c
  Script Kiddy authored May 11, 2020
  
  e8fe530c
10 May, 2020 1 commit
- Minor Improvments · 699a95a2
  Nikita Sirgienko authored May 10, 2020
  
  699a95a2
07 May, 2020 1 commit
- Realise some suggestions and change logic for more correct behaviour · bb01c5c0
  Nikita Sirgienko authored May 07, 2020
  
  bb01c5c0
05 May, 2020 1 commit

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

Script Kiddy authored May 05, 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"

110b8a98

04 May, 2020 2 commits

Fix problem with inconveniences values in menus (always "default colour"... · 726c9860
Nikita Sirgienko authored May 04, 2020
```
Fix problem with inconveniences values in menus (always "default colour" chosen) after loaded command entries with formatting
```
726c9860

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

Script Kiddy authored May 04, 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"

d53f4947

29 Apr, 2020 1 commit

Fix bug with missing default values of format parameters in Command Entry,... · c1d3fd7f

Nikita Sirgienko authored Apr 29, 2020

Fix bug with missing default values of format parameters in Command Entry, which made it impossible to reset formating parameters. Also, fix bug with save/load text color parameter, with saving forward and backward compability.

c1d3fd7f

28 Apr, 2020 1 commit
- [Octave] Fix bug, when Cantor ignore the plot integration setting and still... · 3ee4cdf6
  Nikita Sirgienko authored Apr 28, 2020
```
[Octave] Fix bug, when Cantor ignore the plot integration setting and still try to catch images from Octave
```
  3ee4cdf6
15 Apr, 2020 2 commits
- GIT_SILENT Update Appstream for new release · 1a453d73
  Christoph Feck authored Apr 15, 2020
  
  1a453d73
- GIT_SILENT Upgrade release service version to 20.04.0. · ac5ebc20
  Christoph Feck authored Apr 15, 2020
  
  ac5ebc20
01 Apr, 2020 1 commit

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

Script Kiddy authored Apr 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"

3529308c

28 Mar, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.03.90. · 3d6ea919
  Christoph Feck authored Mar 28, 2020
  
  3d6ea919
21 Mar, 2020 1 commit

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

Script Kiddy authored Mar 21, 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"

596b2e71

15 Mar, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.03.80. · 05534cbb
  Albert Astals Cid authored Mar 15, 2020
  
  05534cbb
09 Mar, 2020 1 commit
- Merge remote-tracking branch 'origin/release/19.12' · 1da2faa3
  Albert Astals Cid authored Mar 10, 2020
  
  1da2faa3
03 Mar, 2020 1 commit
- Fix problem with Python server on Windows. This commit makes python backend workable on Windows · 712d8056
  Nikita Sirgienko authored Mar 03, 2020
  
  712d8056
01 Mar, 2020 1 commit
- Merge branch 'l-python' into 'master' · 0c6d59db
  Nikita Sirgienko authored Mar 01, 2020
```
[Python Backend] Port QRegExp to QRegularExpression

See merge request kde/cantor!7
```
  0c6d59db