Commits · 63c8ecde096d5c47de8b4ab338687898057fc441 · Education / Cantor

01 Aug, 2020 1 commit

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

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"

63c8ecde

31 Jul, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.07.90. · ad795417
  Christoph Feck authored Jul 31, 2020
  
  ad795417
27 Jul, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · e94eb686
  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"
```
  e94eb686
- GIT_SILENT made messages (after extraction) · 80d4d6f0
  Script Kiddy authored Jul 27, 2020
  
  80d4d6f0
16 Jul, 2020 1 commit

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

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"

4e7f321d

15 Jul, 2020 1 commit

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

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"

7d89fc8b

14 Jul, 2020 1 commit

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

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"

ecc8c84c

13 Jul, 2020 1 commit

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

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"

528ce87d

11 Jul, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.07.80. · 307f8016
  Albert Astals Cid authored Jul 11, 2020
  
  307f8016
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 3 commits
- GIT_SILENT Update Appstream for new release · aae4bae4
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit cf99f2af)
```
  aae4bae4
- 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
02 Jul, 2020 2 commits
- [Python] Improve Plotly graphic package handler · aab134ca
  Nikita Sirgienko authored Jul 02, 2020
  
  aab134ca
- Fix minor typos · 96334a87
  Yuri Chornoivan authored Jul 02, 2020
  
  96334a87
01 Jul, 2020 5 commits
- [GSoC 2020][T9475] Support popular Julia plot packages in PlotExtension · 9b2f4422
  Nikita Sirgienko authored Jul 02, 2020
  
  9b2f4422
- [Octave] Fix build error · 8aac1569
  Nikita Sirgienko authored Jul 01, 2020
  
  8aac1569
- [Julia][GSoC 2020] Move julia hardcoded GR support to new GraphicPackage code · 84b3c575
  Nikita Sirgienko authored Jul 01, 2020
  
  84b3c575
- [Octave] Move plot commands info to graphic_packages.xml according new... · 286400db
  Nikita Sirgienko authored Jul 01, 2020
```
[Octave] Move plot commands info to graphic_packages.xml according new functionality of GraphicPackage
```
  286400db
- Extend functionality of GraphicPackage: add posibility for not good, but... · f4ca4d55
  Nikita Sirgienko authored Jul 01, 2020
```
Extend functionality of GraphicPackage: add posibility for not good, but workable method of tracking plot by command contents
```
  f4ca4d55
30 Jun, 2020 2 commits
- [Julia] Minor improvment in juliaexpression.cpp · d369291f
  Nikita Sirgienko authored Jun 30, 2020
  
  d369291f
- Fix include · 20d089f0
  Stefan Gerlach authored Jun 30, 2020
  
  20d089f0
29 Jun, 2020 6 commits
- Fix compilation on Windows · 9a54a1ce
  Stefan Gerlach authored Jun 29, 2020
  
  9a54a1ce
- [GSoC 2020] Update zoom widget according zoom changing from ZoomIn/ZoomOut actions · e072b082
  Nikita Sirgienko authored Jun 29, 2020
  
  e072b082
- [Octave] Refactor graphic catching to GraphicPackage · 86679168
  Nikita Sirgienko authored Jun 29, 2020
  
  86679168
- Remove redundant debug output in GraphicPackage · 88d05e69
  Nikita Sirgienko authored Jun 29, 2020
  
  88d05e69
- Some improvments in GraphicPackage and the code, which used it, in Session · 5b039912
  Nikita Sirgienko authored Jun 29, 2020
  
  5b039912
- [Python] Test improvments · c67765bd
  Nikita Sirgienko authored Jun 29, 2020
  
  c67765bd