Commits · fb5d6d7979d9e2e6efb296ac8ec54cc7d140989d · Education / Cantor

25 Mar, 2016 1 commit
- Fix the creation of temporary folders in R backend · fb5d6d79
  Filipe Saraiva authored Mar 25, 2016
  
  fb5d6d79
07 Mar, 2016 1 commit

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

Script Kiddy authored Mar 07, 2016

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"

70026984

09 Feb, 2016 2 commits
- Add .arcconfig file · b61cc7e1
  Filipe Saraiva authored Feb 09, 2016
  
  b61cc7e1
- Improve the fix using non-capturing groups · 6586a64b
  Filipe Saraiva authored Feb 09, 2016
```
Thanks matpen@dnet.it!
BUG: 348128
CCMAIL: matpen@dnet.it
```
  6586a64b
06 Feb, 2016 2 commits
- Merge branch 'master' of git.kde.org:cantor · a94da328
  Filipe Saraiva authored Feb 06, 2016
  
  a94da328
- After version 6.5, Sage changed its name to SageMath. So, Cantor supports · 5d185d21
  Fernando Teles authored Feb 06, 2016 and Filipe Saraiva committed Feb 06, 2016
```
to newer versions was broken. I changed a string to resolve this issue.
BUG: 348128
FIXED-IN: 16.04
CLOSES: D903
DONE: T1029
CCMAIL: fernandotalves@gmail.com
```
  5d185d21
01 Feb, 2016 1 commit

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

Script Kiddy authored Feb 01, 2016

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"

5da70668

30 Jan, 2016 1 commit

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

Script Kiddy authored Jan 30, 2016

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"

ad75e06d

18 Jan, 2016 1 commit

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

Script Kiddy authored Jan 18, 2016

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"

307be53e

13 Jan, 2016 1 commit
- Add README.md · 0360fe20
  Filipe Saraiva authored Jan 13, 2016
  
  0360fe20
29 Dec, 2015 1 commit

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

Script Kiddy authored Dec 29, 2015

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"

b64e33f8

10 Dec, 2015 1 commit
- Put Filipe Saraiva as current maintainer · 27e3e21c
  Filipe Saraiva authored Dec 10, 2015
  
  27e3e21c
09 Dec, 2015 1 commit

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

Script Kiddy authored Dec 09, 2015

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"

1e16bab7

07 Dec, 2015 1 commit

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

Script Kiddy authored Dec 07, 2015

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"

ac6d7d1d

22 Nov, 2015 1 commit

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

Script Kiddy authored Nov 22, 2015

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"

2154f24b

17 Nov, 2015 1 commit

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

Script Kiddy authored Nov 17, 2015

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"

a0f0d420

15 Nov, 2015 1 commit
- Update README · 31e70328
  Filipe Saraiva authored Nov 15, 2015
  
  31e70328
14 Nov, 2015 2 commits
- Use new KCrash API for init. · bb8f5238
  Andreas Cord-Landwehr authored Nov 14, 2015
  
  bb8f5238
- Fix linking against KCrash for DrKonqui integration. · 442e572f
  Andreas Cord-Landwehr authored Nov 14, 2015
  
  442e572f
04 Nov, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · c2a1c5d0
  Script Kiddy authored Nov 04, 2015
```
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"
```
  c2a1c5d0
- SVN_SILENT made messages (after extraction) · e68a9e9f
  Script Kiddy authored Nov 04, 2015
  
  e68a9e9f
01 Nov, 2015 1 commit
- Merge branch 'master' into labplot-integration · 93f14d4d
  Alexander Rieder authored Nov 01, 2015
  
  93f14d4d
19 Oct, 2015 2 commits

Merge branch 'Applications/15.08' · e4073caa
Harald Sitter authored Oct 19, 2015
```
Conflicts:
	src/backends/octave/octavebackend.kcfg
```
e4073caa

by default use octave-cli rather than octave · 6a3bc6c3

Harald Sitter authored Oct 19, 2015

'octave' can randomly decide to load its GUI rather than the CLI depending
on environmental factors. We cannot stdin control the GUI, so there is no
point in introducing this instability but instead call octave-cli directly
since it is the only possibly operation mode we support.

(NB there also is a --no-gui switch which for me doesn't appear to work for
 some reason, so octave-cli directly seems the most reliable approach to
 this)

REVIEW: 125646

6a3bc6c3

18 Oct, 2015 1 commit
- Fix finding Python libraries on ArchLinux. · d604bce7
  Alex Merry authored Oct 18, 2015
  
  d604bce7
20 Sep, 2015 1 commit

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

Script Kiddy authored Sep 20, 2015

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"

15c9f474

19 Sep, 2015 1 commit
- Add KAlgebra icon · 23f8d5bf
  Filipe Saraiva authored Sep 19, 2015
```
BUG: 352914
FiXED-IN: 15.12
```
  23f8d5bf
18 Sep, 2015 13 commits
- Improve implementation of update highlighter · b0ba31c7
  Filipe Saraiva authored Sep 18, 2015
```
after a palette change.
REVIEW: 125303
```
  b0ba31c7
- Remove KDELibs4Support \o/ · 50b26f6b
  Filipe Saraiva authored Sep 18, 2015
```
DIGEST: Remove KDELibs4Support
```
  50b26f6b
- Add kde_enable_exceptions · 3bdd5b0b
  Filipe Saraiva authored Sep 18, 2015
  
  3bdd5b0b
- Add KF5::TextWidget as requirement and link · 6da5eb16
  Filipe Saraiva authored Sep 18, 2015
```
it to HelpPanel plugin.
```
  6da5eb16
- Add KF5::DocTools as requirement · e4c7d9f2
  Filipe Saraiva authored Sep 18, 2015
  
  e4c7d9f2
- Remove KGlobalSettings and implements a substitute to · 366dd878
  Filipe Saraiva authored Sep 18, 2015
```
KGlobalSettings::kdisplayPaletteChanged signal.
```
  366dd878
- Remove KGlobal header · b4b72962
  Filipe Saraiva authored Sep 18, 2015
  
  b4b72962
- Add QDebug header · 23d8aacd
  Filipe Saraiva authored Sep 18, 2015
  
  23d8aacd
- Remove kdebug.h · 585b38eb
  Filipe Saraiva authored Sep 18, 2015
  
  585b38eb
- Remove kdemacros.h · b6b41515
  Filipe Saraiva authored Sep 18, 2015
  
  b6b41515
- Add QStandardPaths header where it is required · 7195a062
  Filipe Saraiva authored Sep 18, 2015
  
  7195a062
- Link KF5::KIOWidgets to cantorlibs. Therefore, KUrlRequester · adb73466
  Filipe Saraiva authored Sep 18, 2015
```
from KIOWidget will be used instead KDELibs4Support version.
```
  adb73466
- Port QString::(from|to)Ascii to QString::(from|to)Latin1 · 0765bc8b
  Filipe Saraiva authored Sep 18, 2015
```
QString::(from|to)Ascii deprecated in Qt5.
```
  0765bc8b