0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-26 17:38:09 +03:00
Commit Graph

1738 Commits

Author SHA1 Message Date
Arin Alex
794ada650f Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 18:36:44 +03:00
Arin Alex
3b1d6bfbbe Datasource editor has been added to chart item 2017-07-14 18:36:31 +03:00
Arin Alexander
0a60babd69 Finish 1.4.34
# Conflicts:
#	limereport/lrreportrender.cpp
2017-07-14 17:44:39 +03:00
Arin Alexander
69425939b4 Finish 1.4.34 2017-07-14 17:43:17 +03:00
Arin Alexander
f9564fac56 Version has been changed 2017-07-14 17:42:17 +03:00
Arin Alexander
0e870003e3 Page items zValue has been changed 2017-07-14 17:39:47 +03:00
Arin Alex
e5e873eb40 Merge branch '1.4_ChartItem' into develop 2017-07-13 14:40:40 +03:00
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
57a46f5798 Subdetail headers render for column mode has been fixed 2017-07-11 12:45:22 +03:00
Arin Alexander
c6d5e23ddf Subdetail headers render for column mode has been fixed 2017-07-11 12:44:52 +03:00
Spiek
4e1a680e09 Syntax Error in mainicon.rc files has been fixed 2017-07-11 11:18:29 +02: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
c545a716e6 Merge branch 'master' into develop 2017-06-30 13:57:56 +03:00
Arin Alexander
02d9213edf Build has been fixed 2017-06-30 13:52:27 +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
a9455b81db Band names translation has been fixed
Subdetail header render has been fixed
2017-06-30 13:23:53 +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
d0477cbb14 Script function names have been translated
# Conflicts:
#	limereport/lrscriptenginemanager.cpp
#	translations/limereport_ru.ts
2017-06-29 03:24:45 +03:00
Arin Alexander
8ba553d179 Script function names have been translated 2017-06-29 03:17:19 +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
7832dcc055 Fix #79: qDebug "render time" message 2017-06-29 02:47:32 +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
27b5ca5447 Band names translation has been added 2017-06-29 02:33:29 +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
622765d14d Band location has been fixed 2017-06-29 00:55:57 +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
28a9aecdd3 Object properties translation has been updated 2017-06-28 18:41:35 +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
437281c81e Russian translation has been fixed 2017-06-28 16:58:43 +03:00
Arin Alexander
1354c4a253 Russian translation has been fixed 2017-06-28 16:58:01 +03:00
Arin Alexander
67d263ed4f Merge branch 'master' into develop
# Conflicts:
#	translations/limereport_ru.ts
2017-06-28 11:29:27 +03:00
Arin Alexander
89f67df7ee Russian translation has been fixed 2017-06-28 11:21:13 +03:00
Arin Alexander
4755bd7811 Russian translation has been fixed 2017-06-28 11:16:50 +03:00
Arin Alexander
76a1ac5938 Russian translation has been updated
# Conflicts:
#	translations/limereport_ru.ts
2017-06-27 23:21:46 +03:00
Arin Alexander
06241991f7 Russian translation has been updated 2017-06-27 23:13:55 +03:00
Arin Alexander
af3d5840d6 Russian translation has been updated 2017-06-27 23:12:22 +03:00
Arin Alexander
69feef3d98 Callback datasource has been fixed 2017-06-23 16:04:45 +03:00