Commit Graph

482 Commits

Author SHA1 Message Date
Arin Alex
9fe00a0e41 Merge branch 'master' into 1.4 2016-11-07 20:18:49 +03:00
Arin Alexander
85550995b6 Merge branch '1.4' into 1.4_QJSEngine 2016-11-05 18:13:07 +03:00
Arin Alexander
0bfff7cb00 Merge branch 'master' into 1.4 2016-11-05 18:12:41 +03:00
Arin Alexander
77b151a788 Insert mode is canceled when band inserted 2016-11-05 18:12:10 +03:00
Arin Alexander
47b5aca63a Merge branch '1.4' into 1.4_QJSEngine 2016-11-05 00:48:39 +03:00
Arin Alexander
fbb9ac47af Merge branch 'master' into 1.4
# Conflicts:
#	translations/limereport_es_ES.qm
#	translations/limereport_es_ES.ts
#	translations/limereport_ru.qm
#	translations/limereport_ru.ts
2016-11-05 00:39:51 +03:00
Arin Alexander
8c09e5ed51 Images has been changed 2016-11-05 00:37:33 +03:00
Arin Alexander
97c1eb3f77 Dialogs for QJSEngine has been fixed. Child objects registration has been added 2016-11-04 21:42:15 +03:00
Arin Alexander
5b95b9b3d6 followTo has been added
followTo has been added
2016-11-04 01:25:46 +03:00
Arin Alexander
04745def1e TextItem splitting has been fixed 2016-11-04 01:24:03 +03:00
Arin Alex
cf1b2a4146 qjsengine and uitools are switched on 2016-11-02 14:54:36 +03:00
Arin Alex
db87e5dc9e Build with uitools has been fixed 2016-11-02 11:15:05 +03:00
Arin Alex
c786be0ca4 pri file has been refactored
pri file refactored
2016-11-02 00:57:55 +03:00
Arin Alex
4520347dbe Merge branch '1.4' into 1.4_QJSEngine 2016-11-01 22:32:12 +03:00
Arin Alex
f01c586926 Merge branch 'master' into 1.4 2016-11-01 22:32:02 +03:00
Arin Alex
bb6e934152 Band background color has been fixed 2016-11-01 22:31:48 +03:00
Arin Alex
2034aa15c8 QJSEngine has been added 2016-11-01 20:42:45 +03:00
Arin Alex
3bf993eb5a Merge branch 'master' into 1.4 2016-11-01 20:07:30 +03:00
Arin Alex
724e3c004c TextItem has been fixed 2016-11-01 20:07:10 +03:00
Arin Alexander
16605c1414 Merge branch 'master' into 1.4 2016-11-01 14:56:18 +03:00
Arin Alexander
c623932afb Object inspector has been fixed 2016-11-01 14:56:06 +03:00
Arin Alexander
a6d17858cf Merge branch 'master' into 1.4 2016-10-19 17:33:39 +03:00
Arin Alexander
b8ecc89ff0 ObjectInspector for dark themes has been fixed 2016-10-19 17:33:26 +03:00
Arin Alexander
503329bca2 Merge branch 'master' into 1.4 2016-10-19 01:26:52 +03:00
Arin Alexander
2768d13301 Property editing of multi selected objects has been fixed 2016-10-19 01:26:40 +03:00
Arin Alexander
2152c3f4f1 Merge branch 'master' into 1.4 2016-10-18 15:00:40 +03:00
Arin Alexander
ebde2c1c20 Hide unused warnings 2016-10-18 15:00:26 +03:00
Arin Alexander
856a3e6bee Merge branch 'master' into 1.4 2016-10-18 13:58:49 +03:00
Arin Alexander
8ed24f9f75 alternateBackgrounColor property has been added 2016-10-18 13:58:26 +03:00
Arin Alexander
6e74cd266f Merge branch 'master' into 1.4 2016-10-12 00:54:09 +04:00
Arin Alexander
dd40aa1137 TextItem splitting has been fixed 2016-10-12 00:53:49 +04:00
Arin Alexander
d95d1fef1d Merge branch 'master' into 1.4 2016-10-07 00:57:57 +04:00
Arin Alexander
6a55e6c0c2 columnCount and columnsFillDirection properties have been added to DataHeaderBand, DataFooterBand, SubDetailHeaderBand and SubDetailFooterBand 2016-10-07 00:57:38 +04:00
Arin Alexander
6982edc8ec Disable creation of Tear-off band if it exists 2016-10-04 04:55:02 +04:00
Arin Alexander
d6eedd8cbd Merge branch 'master' into 1.4
# Conflicts:
#	limereport/limereport.pri
#	limereport/lrreportrender.cpp
2016-10-04 04:47:05 +04:00
Arin Alexander
dc41959d52 Tear-off band has been added
Tear-off band has been added

Tear-off band has been added
2016-10-04 04:23:55 +04:00
Arin Alexander
e4457787f5 Merge branch 'master' into 1.4 2016-10-03 22:56:58 +04:00
Arin Alexander
46e89b8e9d Fix #51 4.6 build 2016-10-03 22:56:48 +04:00
Arin Alexander
d9e865592e Merge branch 'master' into 1.4 2016-10-03 20:56:16 +04:00
Arin Alexander
d0091cb2f7 Rendering report with DataHeader band has been fixed 2016-10-03 20:56:05 +04:00
Arin Alexander
1e7aa027d7 Merge branch 'master' into 1.4
# Conflicts:
#	limereport/lrreportrender.cpp
2016-09-28 02:27:45 +04:00
Arin Alexander
fc271d6a3b Nested group bands render has been fixed 2016-09-28 02:24:55 +04:00
Arin Alexander
2b63fa1149 Merge branch 'master' into 1.4
# Conflicts:
#	limereport/lrreportrender.cpp
2016-09-18 12:26:48 +04:00
Arin Alexander
7c4d3bf8da Fix #48 the error about "initDatasources" 2016-09-18 12:05:46 +04:00
Arin Alexander
f1e0be4a91 Merge branch 'master' into 1.4 2016-09-16 15:48:18 +04:00
Arin Alexander
2cc1cc0d13 Paste command does not change the name of the item if it does not exist 2016-09-16 15:45:31 +04:00
Arin Alexander
2b8422a9f3 Merge branch 'master' into 1.4 2016-09-16 03:32:32 +04:00
Arin Alexander
45610e7e19 Items removing have been fixed 2016-09-16 03:32:14 +04:00
Arin Alexander
8f188414ed master build has been fixed 2016-09-16 03:31:22 +04:00
Arin Alexander
50cd32492e Merge branch 'master' into 1.4 2016-09-16 03:02:42 +04:00