0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-30 19:38:10 +03:00
Commit Graph

1022 Commits

Author SHA1 Message Date
Arin Alexander
b9efa71ac4 Merge branch 'master_lowMemory' 2016-12-19 19:46:39 +03:00
Arin Alexander
64b2c9b8d9 Merge branch '1.4' into 1.4_lowMemory 2016-12-13 13:16:37 +03:00
Arin Alexander
791efd136e Merge branch 'master' into 1.4
# Conflicts:
#	limereport/lrreportengine.cpp
2016-12-13 12:51:47 +03:00
Arin Alexander
e138ee2a7e Merge branch 'master' into master_lowMemory 2016-12-13 12:48:16 +03:00
Arin Alexander
97bd5e4584 Fix #56 isBusy has been added to ReportEngine 2016-12-13 12:47:55 +03:00
Arin Alexander
eeea8c2643 QTextDocument is created as needed 2016-12-13 00:07:50 +03:00
Arin Alexander
46c830212f Render child bands has been fixed 2016-12-12 23:41:38 +03:00
Arin Alexander
fcf9590745 QTextDocument is created as needed 2016-12-12 23:24:49 +03:00
Arin Alex
32bf7765ec Render empty data band has been fixed 2016-12-07 23:04:15 +03:00
Arin Alex
2cb5f8e71c Merge branch 'master' into 1.4 2016-12-07 21:11:31 +03:00
fralx
86ccf6868c Merge pull request #54 from lchauvinQt/master
Fix random crash while scrolling into the viewer, avoid the index out…
2016-12-07 21:02:31 +03:00
Arin Alex
00b30be295 Merge branch 'master' into 1.4
Conflicts:
	common.pri
2016-12-07 20:41:04 +03:00
Arin Alex
a73bc90417 travis build: ppa:beineri/opt-qt561-trusty --> ppa:beineri/opt-qt562-trusty 2016-12-07 20:35:56 +03:00
lchauvinQt
80fa86a3ca Fix random crash while scrolling into the viewer, avoid the index out of range when the " m_currentPage " is not valid 2016-12-06 16:28:28 +01:00
Arin Alexander
114e690541 travis build: ppa:beineri/opt-qt561-trusty --> ppa:beineri/opt-qt562-trusty 2016-12-06 01:08:30 +03:00
Arin Alexander
6d31f20566 OneSlotDS has been added to demo_r1 2016-12-06 00:27:22 +03:00
Arin Alexander
bca1019803 Path to database has been fixed 2016-12-06 00:27:21 +03:00
Arin Alexander
54562d80cd checkIfEmpty has been refactored 2016-12-06 00:27:21 +03:00
Arin Alexander
229e8f529d resourcePath property has been added to ImageItem 2016-12-06 00:27:09 +03:00
Arin Alexander
21e3a6fbf9 Release version has been changed 2016-11-26 00:50:30 +03:00
Arin Alexander
eac1a029d9 Merge branch '1.4_followTo' into 1.4 2016-11-25 23:54:36 +03:00
Arin Alexander
dc5ee3d98b Debug messages have been removed 2016-11-25 23:54:23 +03:00
Arin Alexander
151ae9d73d Merge branch '1.4' into 1.4_followTo 2016-11-25 23:11:15 +03:00
Arin Alexander
819cc8a1c3 Merge branch '1.4' into 1.4_followTo
# Conflicts:
#	limereport/items/lrtextitem.cpp
2016-11-25 22:41:28 +03:00
Arin Alexander
b4dea2fcfd New demo reports have been added 2016-11-18 01:14:01 +03:00
Arin Alexander
61653c9bb3 Calculated condition has been added to group band header 2016-11-18 01:12:23 +03:00
Arin Alexander
43bff192a9 Merge branch '1.4' into 1.4_QJSEngine 2016-11-17 00:50:52 +03:00
Arin Alexander
e9b32ec7d7 Version has been changed 2016-11-17 00:50:36 +03:00
Arin Alexander
7986fda128 Merge branch '1.4' into 1.4_QJSEngine 2016-11-17 00:42:24 +03:00
Arin Alexander
65d7bc7774 Merge branch 'master' into 1.4 2016-11-17 00:38:00 +03:00
Arin Alexander
2fb47a5830 Connect connection has been refactored 2016-11-17 00:37:37 +03:00
Arin Alex
33959d3882 Icons have been changed 2016-11-16 01:31:06 +03:00
Arin Alex
32620ef918 Merge branch '1.4' into 1.4_QJSEngine 2016-11-08 01:10:05 +03:00
Arin Alex
71aaaac34d Merge branch 'master' into 1.4 2016-11-08 01:09:54 +03:00
Arin Alex
0055790bcd setDefaultDatabasePath() has been added to DataSourceManager 2016-11-08 01:09:35 +03:00
Arin Alex
6127db13e6 Merge branch '1.4' into 1.4_ChartItem
Conflicts:
	limereport/items/items.qrc
2016-11-07 20:23:47 +03:00
Arin Alex
b04c1a2670 Merge branch '1.4' into 1.4_QJSEngine 2016-11-07 20:21:32 +03:00
Arin Alex
be67e6309b pri file has been refactored
pri file refactored
2016-11-07 20:19:09 +03:00
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