Commits · 1a55790f477f5f2ece5aa901b9a943f4f1d90d0a · Education / Cantor

12 Mar, 2017 1 commit
- Removing the asynchronous python3 server call. · 1a55790f
  Minh Ngo authored Mar 12, 2017
```
BUG: 373150
```
  1a55790f
02 Dec, 2016 2 commits

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

Script Kiddy authored Dec 02, 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"

6cf3b620

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

Script Kiddy authored Dec 02, 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"

82362d33

30 Nov, 2016 1 commit

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

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

c06fe138

25 Nov, 2016 1 commit

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

Script Kiddy authored Nov 25, 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"

6ed4e8fd

23 Nov, 2016 1 commit

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

Script Kiddy authored Nov 23, 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"

c1732479

22 Nov, 2016 1 commit

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

Script Kiddy authored Nov 22, 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"

fb13f463

17 Nov, 2016 2 commits

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

Script Kiddy authored Nov 17, 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"

2abf2e0b

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

Script Kiddy authored Nov 17, 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"

b6777e7a

14 Sep, 2016 1 commit

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

Script Kiddy authored Sep 14, 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"

7e926426

31 Mar, 2016 1 commit

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

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

86dbc112

30 Mar, 2016 2 commits
- Use BUILD_TESTING consistently · 0201a214
  Andreas Sturmlechner authored Mar 30, 2016
```
REVIEW: 127527
```
  0201a214
- SVN_SILENT made messages (.desktop file) · 7473e3fb
  Script Kiddy authored Mar 25, 2016 and Andreas Sturmlechner committed Mar 30, 2016
  
  7473e3fb
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

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

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

04 Nov, 2015 1 commit

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

18 Sep, 2015 2 commits
- 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
- Linking Qt5::Widgets in Python3Server · 3480a369
  Filipe Saraiva authored Sep 18, 2015
  
  3480a369
13 Sep, 2015 1 commit

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

Script Kiddy authored Sep 13, 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"

2e6fa3c5

25 Aug, 2015 1 commit

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

Script Kiddy authored Aug 25, 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"

f3abf6ff

22 Aug, 2015 1 commit

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

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

d9f78d88

21 Aug, 2015 1 commit

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

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

fc5a229a

16 Aug, 2015 1 commit

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

Script Kiddy authored Aug 16, 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"

9ffcc93a

14 Aug, 2015 1 commit

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

Script Kiddy authored Aug 14, 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"

d8034e79

13 Aug, 2015 1 commit

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

Script Kiddy authored Aug 13, 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"

7e253a7d

12 Aug, 2015 1 commit

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

Script Kiddy authored Aug 12, 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"

8a6cf666

11 Aug, 2015 1 commit

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

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

98e8bc56

10 Aug, 2015 1 commit

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

Script Kiddy authored Aug 10, 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"

68ba87cb

09 Aug, 2015 1 commit

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

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

59fed415

08 Aug, 2015 1 commit

Plugin loading mechanism ported to Qt5/KF5 · 6880e168

Filipe Saraiva authored Aug 08, 2015

Now, Cantor is using K_PLUGIN_FACTORY_WITH_JSON and the
plugins are installed in different directories of Qt
plugin system:
    * backends are in cantor/backends;
    * assistants are in cantor/assistants;
    * panels are in cantor/panels;
The metadata now are using .json files and they are
inserted in plugin. .desktop files were deprecated
except by the libcantorlibs plugins - there are
.desktop files yet, but they are converted to .json
files during the build.

REVIEW: 124168

6880e168

30 Jul, 2015 1 commit

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

Script Kiddy authored Jul 30, 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"

4398a399

18 May, 2015 1 commit
- KStandardDirs ported to QStandardPaths · 2af4705c
  Filipe Saraiva authored May 16, 2015
```
REVIEW: 123825
```
  2af4705c
04 May, 2015 1 commit

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

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

aac8e372

27 Apr, 2015 2 commits
- SVN_SILENT made messages (.desktop file) · 15492e29
  Script Kiddy authored Apr 27, 2015
  
  15492e29
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4a0415d1
  Script Kiddy authored Apr 27, 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"
```
  4a0415d1
26 Apr, 2015 2 commits
- SVN_SILENT made messages (.desktop file) · 9c2267d6
  Script Kiddy authored Apr 26, 2015
  
  9c2267d6
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4c67fcec
  Script Kiddy authored Apr 26, 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"
```
  4c67fcec