Merge branch 'gsoc2018_json'

Authored by asemke on Jul 4 2018, 9:21 PM.

Description

Merge branch 'gsoc2018_json'

Merged Changes

CommitAuthorDetailsCommitted
27856d4b7501asemke
Removed obsolete includes. 
Jul 4 2018
8bc52f7a9b81andreyc
Merge branch 'gsoc2018_json' of http://anongit.kde.org/labplot into… 
Jul 4 2018
25e90bdeacb5andreyc
Add license for new files 
Jul 4 2018
5e77da6f4e0dasemke
Minor improvements in QJsonModel. 
Jul 4 2018
024f863f0003asemke
Adjusted the code style in QJsonModel to LabPlot's conventions. 
Jul 4 2018
a939ccc49b05andreyc
Add parsing rows name 
Jul 3 2018
222cfdc08cb2asemke
Merge branch 'master' into gsoc2018_json 
Jul 2 2018
e56c46326747asemke
In QJosnModel show the icon for the first column only. 
Jul 2 2018
352eb7dee7bfasemke
Fixed the linking for JSON tests. 
Jul 2 2018
02b8eaa1d448andreyc
Fix Json treeview iconSize 
Jul 2 2018
112a7597676aandreyc
Add icons for JSON treeview 
Jul 2 2018
e45c86272897andreyc
Merge ImportFileWidget diffs 
Jun 25 2018
2825c15e07b1andreyc
Improve JSON import and auto type detect 
Jun 25 2018
8fe0c28ee241andreyc
Merge branch diffs 
Jun 20 2018
a4f1fa3706c7andreyc
Improve JsonFilter import mechanism 
Jun 20 2018
3c486aa9bea8asemke
Added some boilerplate code to add later icons for arrays and objects in… 
Jun 18 2018
15f14b7051e2asemke
*.json files can be recognized as ASCII. so, do the check for the json… 
Jun 18 2018
5f0e5e1d876casemke
In the JSON tree view, resize the columns to fit the content and use… 
Jun 18 2018
e01020ba7464andreyc
Add treeview for selecting JSON fields 
Jun 14 2018
38360659885bandreyc
Merge branch 'master' into gsoc2018_json 
Jun 5 2018
4fa28562b86aandreyc
Add JsonFilter to import file dialog 
Jun 5 2018
f27a4bc88c5eandreyc
Add tests for JsonFilter 
Jun 3 2018
c6c7bba1d8b0andreyc
Parsing bugfix 
Jun 3 2018
57fd6d360d67andreyc
Add initial code for Json filter 
May 30 2018