0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-27 01:48:09 +03:00
Commit Graph

358 Commits

Author SHA1 Message Date
Arin Alex
1b8bd14b35 Labels column has been fixed 2017-07-13 14:39:07 +03:00
Arin Alex
c090883cf1 Merge branch 'develop' into 1.4_ChartItem
Conflicts:
	limereport/items/items.qrc
	limereport/limereport.pri
2017-07-12 21:40:24 +03:00
fralx
49b6e9500a Merge pull request #80 from Spiek/develop
Fix Windows Build Enviroment
2017-07-11 12:50:02 +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
Spiek
ec37242475 Build Environment for Windows has been fixed
- language files are now compile-able if path to build environment contains white spaces
- demo reports are now copied correctly if REPORTS_DIR or EXTRA_DIR contains white spaces
2017-07-11 11:18:28 +02: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
9c95206dfe Band names translation has been fixed 2017-06-30 13:21:16 +03:00
Arin Alexander
36d72a5756 Script function names have been translated 2017-06-29 03:16:30 +03:00
Arin Alexander
815a67e17d Function categories have been translated 2017-06-29 03:04:30 +03:00
Arin Alexander
68d0bba8cd Fix #79: qDebug "render time" message 2017-06-29 02:47:32 +03:00
Arin Alexander
774f334e40 Fix #79: qDebug "render time" message 2017-06-29 02:46:48 +03:00
Arin Alexander
0b6749aef0 Band names translation has been added
# Conflicts:
#	limereport/lrbanddesignintf.h
2017-06-29 02:34:08 +03:00
Arin Alexander
e3d01f1451 Band names translation has been added 2017-06-29 02:32:42 +03:00
Arin Alexander
c40169146c Band location has been fixed
# Conflicts:
#	limereport/lrbanddesignintf.h
2017-06-29 00:57:41 +03:00
Arin Alexander
bf38d57406 Band location has been fixed 2017-06-29 00:55:16 +03:00
Arin Alexander
865d9fca5c Object properties translation has been updated
# Conflicts:
#	translations/limereport_ru.ts
2017-06-28 18:42:17 +03:00
Arin Alexander
f671c3a347 Object properties translation has been updated 2017-06-28 18:40:55 +03:00
Arin Alexander
96c8234872 Russian translation has been fixed 2017-06-28 17:15:05 +03:00
Arin Alexander
36df242787 Russian translation has been fixed
# Conflicts:
#	translations/limereport_ru.ts
2017-06-28 17:00:58 +03:00
Arin Alexander
1354c4a253 Russian translation has been fixed 2017-06-28 16:58:01 +03:00
Arin Alexander
69feef3d98 Callback datasource has been fixed 2017-06-23 16:04:45 +03:00
Arin Alexander
b87009e1de Callback datasource has been fixed 2017-06-23 16:03:50 +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
2383ab253d Finish 1.4.20 2017-06-21 23:54:28 +03:00
Arin Alexander
b0538393d1 Callback datasource columnIndexByName() has been fixed 2017-06-21 23:53:26 +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 Alex
2e6a7473ea no_zint & static_build flags has been added
# Conflicts:
#	common.pri
2017-06-16 03:10:00 +03:00
Arin Alex
2c0e343c55 Static build has been fixed.
CONFIG no_zint & static_build flags have been added
2017-06-16 03:06:09 +03:00
Arin Alex
ad99677d9c "THIS" pointer to report item has been fixed 2017-06-16 03:03:40 +03:00
Arin Alexander
9e5125c8fb Static build has been fixed 2017-06-14 12:07:40 +03:00
Arin Alexander
6a42e0c46c Static build has been fixed 2017-06-14 12:07:02 +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
bd67cf8f12 Build without zint has been fixed
# Conflicts:
#	limereport/limereport.pri
2017-06-13 13:05:36 +03:00
Arin Alexander
6ed6beb395 build without zint has been fixed 2017-06-13 13:03:38 +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
b40d83ab07 Finish 1.4.13 2017-06-12 13:11:18 +03:00
Arin Alexander
801b3b4922 Static build has been fixed 2017-06-12 13:11:00 +03:00
Arin Alexander
ffe9a7e67c Finish 1.4.12 2017-06-07 23:48:24 +03:00
Arin Alexander
0786ee1f32 Group function pattern has been fixed 2017-06-07 23:47:43 +03:00
Arin Alexander
fb494db947 Extended area has been added to page in design mode 2017-06-02 22:11:53 +03:00
Arin Alexander
c4f20b78c1 1.4.11
# Conflicts:
#	limereport/items/lrtextitem.cpp
2017-05-15 20:32:33 +03:00
Arin Alexander
2312c21d84 followTo has been fixed 2017-05-15 20:30:54 +03:00