mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2026-10-14 00:47:06 +03:00
Code Activity
526 Commits 13 Branches 208 Tags
49b6e9500acd0f9441bedbabee6e4abbe0523d0d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Arin Alexander 13328d3e7e 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 8ec1e8a072 Finish 1.4.21 2017-06-23 09:57:10 +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 04ee8ce5d3 Finish 1.4.20 2017-06-21 23:54:27 +03:00
Arin Alexander b0538393d1 Callback datasource columnIndexByName() has been fixed 2017-06-21 23:53:26 +03:00
Arin Alexander e65fbaff42 Merge branch 'master' into develop 2017-06-20 06:02:39 +03:00
Arin Alexander 4aa5f558dd Callback datasource has been fixed 2017-06-20 06:00:53 +03:00
Arin Alexander b44077b443 Callback datasource has been fixed 2017-06-20 06:00:52 +03:00
Arin Alexander 0d64591085 Callback datasource has been fixed 2017-06-20 05:59:39 +03:00
Arin Alex 1c2de35166 CONFIG qtscriptengine & no_formdesigner have been added 2017-06-16 03:17:17 +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 60c45b8832 no_zint & static_build flags has been added 2017-06-16 03:08:28 +03:00
Arin Alex 4e19142358 Version has been changed to 1.4.18 2017-06-16 03:07:07 +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 7f4510073e 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 ab7394eacf Using group functions in the horizontal layout items has been fixed 2017-06-13 17:48:59 +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 67b0889c8d Build without zint has been fixed 2017-06-13 13:04:32 +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 acb0675a93 Finish 1.4.14 2017-06-12 13:36:45 +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 a726104669 Finish 1.4.13 2017-06-12 13:11:17 +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 7405ed59ec 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 dbd753b4d3 1.4.11 2017-05-15 20:31:20 +03:00
Arin Alexander 2312c21d84 followTo has been fixed 2017-05-15 20:30:54 +03:00
Arin Alexander 27a88969b0 1.4.10 2017-04-21 23:04:25 +03:00
Arin Alexander c7a5b638e8 1.4.10 2017-04-21 23:04:24 +03:00
Arin Alexander e3df7c88d1 Print range from QPrinter fix 2017-04-21 23:03:56 +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 09e1c79b87 1.4.9 2017-04-20 21:10:30 +03:00
Arin Alexander b3529ffd0c TextItem render has been fixed 2017-04-20 21:09:52 +03:00
fralx 36ed9443f7 Merge pull request #75 from asmaloney/add-file-watcher 
Optionally monitor changes to files loaded with ReportEngine::loadFromFile()
 2017-04-20 20:56:23 +03:00
fralx 930c4dffdb Merge pull request #74 from asmaloney/fix-spelling 
Fix spelling: slotPreviewWindowDestroed -> slotPreviewWindowDestroyed
 2017-04-20 20:55:22 +03:00
Arin Alexander 87da477803 Finish CH_Private_To_Public 2017-04-19 02:04:40 +03:00
Arin Alexander 0f6f2f1536 Merge branch 'develop' into feature/CH_Private_To_Public 2017-04-19 01:58:22 +03:00
Arin Alexander 64c4a7fc3d Icons have been changed 2017-04-19 02:44:57 +04:00
Arin Alexander 1700576394 Qt4 build fixed 2017-04-19 02:04:14 +04:00
Arin Alexander cb438ceff1 Merge branch 'develop' into feature/CH_Private_To_Public 
# Conflicts:
#	limereport/lrreportdesignwidget.cpp
#	limereport/lrreportdesignwidget.h
#	limereport/lrreportdesignwindow.h
 2017-04-18 22:21:24 +03:00
Arin Alexander d0cf6f4961 Finish Dialog_Designer 
# Conflicts:
#	limereport/limereport.pri
 2017-04-18 21:53:19 +03:00
Arin Alexander 3bdec95a8c Icons have been changed 2017-04-18 21:47:35 +03:00
Arin Alexander 02a8ef8b5c Crash on destroy has been fixed 2017-04-18 20:00:59 +03:00
Arin Alexander 7b04b6efca Dialog Designer intergration has been finished 2017-04-14 02:43:34 +03:00
Arin Alexander 0692435b26 Dialog designers tool bar integration has been added 2017-04-11 11:23:34 +03:00
Arin Alexander cd2e748a9b QtDesigner integration has been added 
QtDesigner intergration has been added
 2017-04-10 18:45:54 +03:00
fralx fae194b36f Merge pull request #72 from asmaloney/fix-crash 
Fix crash when cutting an item using the context menu
 2017-04-10 11:18:53 +03:00