0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-26 01:24:39 +03:00
Commit Graph

106 Commits

Author SHA1 Message Date
Arin Alex
288aef75b2 Watermark
# Conflicts:
#	limereport/items/lrimageitem.h
#	limereport/items/lrtextitem.h
#	limereport/lrbasedesignintf.cpp
#	limereport/lrbasedesignintf.h
2018-03-22 17:41:30 +03:00
Arin Alex
24c9fa1827 Watermark property has been added to TextItem and ImageItem 2018-03-22 17:17:04 +03:00
Arin Alex
01e36f3bbe build without qtscriptengine fixed 2018-03-22 02:38:42 +03:00
Arin Alexander
d79aec5faf Finish Subtotals 2018-03-15 23:01:22 +03:00
Arin Alexander
1c379c568d Finish 1.4.68 (Subgroup fixed) 2018-03-15 11:02:01 +03:00
Arin Alexander
860be394a6 Subgroup band fixed 2018-03-15 10:59:44 +03:00
Arin Alex
4c162e0e47 Group functions have been changed 2018-03-14 11:22:03 +03:00
Arin Alex
3019f239f0 Pages are cloned before generation to prevent them from changing by init script 2018-03-07 19:54:57 +03:00
Arin Alexander
576ebf11ec Finish 1.4.60
# Conflicts:
#	limereport/lrreportrender.cpp
#	limereport/lrreportrender.h
2018-01-18 22:01:24 +03:00
Arin Alexander
ae4a022ecc Prevent double start new page by group headers 2018-01-18 21:44:11 +03:00
Arin Alexander
598bee200f Group bands have been fixed
Port property has been added to connection describer

# Conflicts:
#	limereport/lrreportrender.cpp
2018-01-18 20:34:27 +03:00
Arin Alexander
a80a1298eb Group band has been fixed 2018-01-18 20:28:56 +03:00
Arin Alexander
fa710d2dcf group header printing has been fixed 2018-01-11 02:20:58 +03:00
Arin Alexander
f1e3c96dcb group header printing has been fixed 2018-01-11 02:20:40 +03:00
Arin Alexander
ff55e10e9d windows build fixed 2017-11-30 21:23:11 +03:00
Mateusz Skowroński
f42dde6211 Fix typos. s/contens/contents. 2017-11-04 19:17:49 +01:00
Arin Alex
c42d87b146 enndlessHeight added 2017-10-28 01:19:39 +03:00
Arin Alexander
40bafebbbd Qt4 build fixed 2017-10-26 13:24:06 +04:00
Arin Alexander
992c53e19a TOC generation has been changed 2017-08-31 02:53:34 +03:00
Arin Alexander
2c50a9a791 init commit 2017-08-25 18:01:59 +03:00
Arin Alexander
54c5bc65ed TOC has been added 2017-08-18 22:55:29 +03:00
Arin Alexander
2338c9d8b7 #IS_FIRST_PAGEFOOTER has been fixed 2017-07-24 22:44:58 +03:00
Arin Alexander
987b44e562 #IS_FIRST_PAGEFOOTER has been fixed 2017-07-24 22:44:24 +03:00
Arin Alexander
fa876aa815 Finish 1.4.35 2017-07-21 20:35:50 +03:00
Arin Alexander
5e8305f44f #IS_LAST_PAGEFOOTER & #IS_FIRST_PAGEFOOTER variables have been added 2017-07-21 20:35:33 +03:00
Arin Alexander
0a60babd69 Finish 1.4.34
# Conflicts:
#	limereport/lrreportrender.cpp
2017-07-14 17:44:39 +03:00
Arin Alexander
0e870003e3 Page items zValue has been changed 2017-07-14 17:39:47 +03:00
Arin Alexander
dbfcf29d67 Merge branch 'master' into develop 2017-07-11 12:46:14 +03:00
Arin Alexander
c6d5e23ddf Subdetail headers render for column mode has been fixed 2017-07-11 12:44:52 +03:00
Arin Alexander
dbf56182d2 Build has been fixed 2017-06-30 13:52:27 +03:00
Arin Alexander
fa2ef0f643 Build has been fixed 2017-06-30 13:52:17 +03:00
Arin Alexander
7bc8092191 Band names translation has been fixed
Subdetail header render has been fixed

# Conflicts:
#	limereport/lrreportrender.cpp
2017-06-30 13:29:00 +03:00
Arin Alexander
c3ff1ff462 Subdetail header render has been fixed 2017-06-30 13:22:41 +03:00
Arin Alexander
7722aefa16 Page items have been fixed 2017-06-23 09:58:45 +03:00
Arin Alexander
a43739e91a Page items have been fixed 2017-06-23 09:57:02 +03:00
Arin Alexander
4aa5f558dd Callback datasource has been fixed 2017-06-20 06:00:53 +03:00
Arin Alexander
0d64591085 Callback datasource has been fixed 2017-06-20 05:59:39 +03:00
Arin Alexander
4c791e607c Merge branch 'master' into develop
# Conflicts:
#	limereport/lrreportrender.cpp
#	limereport/lrreportrender.h
2017-06-13 19:05:15 +03:00
Arin Alexander
b17aadb2bb Using group functions in the horizontal layout items has been fixed 2017-06-13 17:48:22 +03:00
Arin Alexander
4ca7d7176b Merge branch 'master' into develop
# Conflicts:
#	limereport/lrreportrender.cpp
2017-06-12 13:39:36 +03:00
Arin Alexander
41d09a15ea Nested groups has been fixed for callback datasources (Thanks to Louis Coetzer) 2017-06-12 13:36:30 +03:00
Arin Alexander
d89fcc53a8 Prevent multi run initscript
Prevent multi run initscript

Prevent multi run initscript &
Build without HAVE_UI_LOADER has been fixed
2017-04-21 00:12:25 +03:00
Arin Alexander
cbf205b728 1.4.9 2017-04-20 21:10:31 +03:00
Arin Alexander
d0cf6f4961 Finish Dialog_Designer
# Conflicts:
#	limereport/limereport.pri
2017-04-18 21:53:19 +03:00
Arin Alexander
cd2e748a9b QtDesigner integration has been added
QtDesigner intergration has been added
2017-04-10 18:45:54 +03:00
fralx
a5231058ec Merge pull request #70 from asmaloney/fix-shadows
Fixes some shadowed vars & avoids string copies using const refs
2017-04-10 11:17:38 +03:00
fralx
6105051d27 Merge pull request #66 from asmaloney/fix-returning-deleted-data
Ensure we aren't returning data that has been deleted …
2017-04-10 11:15:56 +03:00
Andy Maloney
6789b01e79 Fixes some shadowed vars & avoids string copies using const refs 2017-04-08 18:45:58 -04:00
Andy Maloney
942da982ca Ensure we aren't returning data that has been deleted by setting the pointer to NULL. 2017-04-08 09:42:08 -04:00
Andy Maloney
7ebc42c514 Fixes a few instances where nullptrs might be dereferenced 2017-04-08 09:35:09 -04:00