Merge branch 'gsoc2018_json'
Description
Description
Details
Details
- Committed
asemke Jul 4 2018, 9:21 PM - Parents
- R262:27856d4b7501: Removed obsolete includes.
R262:445e7d86ffec: Added some more initialization stuff in the histogram dock. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
27856d4b7501 | asemke | Removed obsolete includes. | Jul 4 2018 | |||
8bc52f7a9b81 | andreyc | Merge branch 'gsoc2018_json' of http://anongit.kde.org/labplot into… | Jul 4 2018 | |||
25e90bdeacb5 | andreyc | Add license for new files | Jul 4 2018 | |||
5e77da6f4e0d | asemke | Minor improvements in QJsonModel. | Jul 4 2018 | |||
024f863f0003 | asemke | Adjusted the code style in QJsonModel to LabPlot's conventions. | Jul 4 2018 | |||
a939ccc49b05 | andreyc | Add parsing rows name | Jul 3 2018 | |||
222cfdc08cb2 | asemke | Merge branch 'master' into gsoc2018_json | Jul 2 2018 | |||
e56c46326747 | asemke | In QJosnModel show the icon for the first column only. | Jul 2 2018 | |||
352eb7dee7bf | asemke | Fixed the linking for JSON tests. | Jul 2 2018 | |||
02b8eaa1d448 | andreyc | Fix Json treeview iconSize | Jul 2 2018 | |||
112a7597676a | andreyc | Add icons for JSON treeview | Jul 2 2018 | |||
e45c86272897 | andreyc | Merge ImportFileWidget diffs | Jun 25 2018 | |||
2825c15e07b1 | andreyc | Improve JSON import and auto type detect | Jun 25 2018 | |||
8fe0c28ee241 | andreyc | Merge branch diffs | Jun 20 2018 | |||
a4f1fa3706c7 | andreyc | Improve JsonFilter import mechanism | Jun 20 2018 | |||
3c486aa9bea8 | asemke | Added some boilerplate code to add later icons for arrays and objects in… | Jun 18 2018 | |||
15f14b7051e2 | asemke | *.json files can be recognized as ASCII. so, do the check for the json… | Jun 18 2018 | |||
5f0e5e1d876c | asemke | In the JSON tree view, resize the columns to fit the content and use… | Jun 18 2018 | |||
e01020ba7464 | andreyc | Add treeview for selecting JSON fields | Jun 14 2018 | |||
38360659885b | andreyc | Merge branch 'master' into gsoc2018_json | Jun 5 2018 | |||
4fa28562b86a | andreyc | Add JsonFilter to import file dialog | Jun 5 2018 | |||
f27a4bc88c5e | andreyc | Add tests for JsonFilter | Jun 3 2018 | |||
c6c7bba1d8b0 | andreyc | Parsing bugfix | Jun 3 2018 | |||
57fd6d360d67 | andreyc | Add initial code for Json filter | May 30 2018 |