python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-24 12:34:39 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,737 Commits 1 Branch 0 Tags 21 MiB
f097b89280
Commit Graph

1058 Commits

Author SHA1 Message Date
fralx
3c4d384400 dropPrinterMargins property has been added to page 2020-05-19 11:48:43 +03:00
fralx
ed8e1eccb4 ChartItem has been fixed 2020-05-18 22:12:05 +03:00
Arin Alexander
c5ef44c1a9 quote() changed to \" 2020-05-12 14:11:58 +03:00
Arin Alexander
ccf8134012 Using variables in the connection describer has been extended 2020-05-08 14:19:02 +03:00
Arin Alexander
ca6241f61e Band moving in design mode has been fixed 2020-04-23 21:03:22 +03:00
Arin Alexander
a4acb912a5 removeGap property has been added to PageFooterBand 2020-04-17 12:28:59 +03:00
Arin Alexander
ae535fc9d3 Translation editor fixded 2020-04-09 17:50:49 +03:00
Arin Alexander
72824cfa6c Build fixed 2020-04-06 22:00:20 +03:00
Arin Alexander
a7db5d51bc ChartItem has been fixed 2020-04-06 19:48:16 +03:00
Tiziano Bacocco
66ae37525d Added CMake support for easy embedding inside CMake projects 
Signed-off-by: Tiziano Bacocco <tizbac2@gmail.com>
 2020-04-04 02:34:40 +02:00
Arin Alexander
20d0637f70 Dialog designer has been fixed 2020-03-24 23:42:05 +03:00
Arin Alexander
e12dcd4df9 Redundant code has been removed 2020-03-19 20:59:24 +03:00
Arin Alexander
3a09d1198a SVGItem default editor has been added 2020-03-19 20:10:56 +03:00
Arin Alexander
3b3790d7bc SVGItem has been added 2020-03-18 13:34:11 +03:00
Arin Alexander
821c48c331 Band splitting has been fixed 2020-03-06 10:56:53 +03:00
Arin Alexander
2ab1ff425f Unused buttons removed 2020-03-04 16:26:42 +03:00
HatEmU
02899c10b9 Typos and errors 2020-03-03 03:19:59 +01:00
HatEmU
5626e9b293 supporting the new Q_ENUM() with Q_ENUMS() backwards compatibility. 2020-03-03 03:13:46 +01:00
HatEmU
a8cbf68347 Replaced the deprecated Q_ENUMS() with the currently supported Q_ENUM() 2020-02-17 05:17:02 +01:00
Arin Alexander
6d1444566d Endless loop on adding not initialized QSqlQueryModels has been fixed 2020-02-27 19:34:52 +03:00
Arin Alexander
cb15a263f0 Qt4 build fixed 2020-02-18 02:16:03 +03:00
Arin Alexander
c53f46bdb7 Qt4 build fixed 2020-02-18 02:03:05 +03:00
Arin Alexander
cdab55a5fd TableBuilder has been fixed 2020-02-16 16:47:26 +03:00
Arin Alexander
2cb39f1f90 Building with qtscriptengine has been fixed 2020-02-05 09:08:54 +03:00
Arin Alexander
0b422bee3b Memory leak has been fixed 2020-02-04 17:16:48 +03:00
Arin Alexander
2ac3f7174b Memory leak has been fixed 2020-02-04 11:40:59 +03:00
Arin Alexander
f73055e347 TOC generation has been fixed 2020-02-03 21:50:28 +03:00
Alexander Arin
ae65a079b0 Print range has been fixed 2020-02-01 20:11:01 +03:00
Arin Alexander
85b3c940d4 ChartItem: Series property editor has been added 2020-01-31 20:00:28 +03:00
Arin Alexander
919173870a ChartItem has been refactored 2020-01-11 02:11:55 +03:00
Arin Alexander
6eb30918e5 ChartItem: from now chart labels will rotate only if not enough space to draw them horizontally 2020-01-09 21:26:25 +03:00
Arin Alexander
e9e98292f2 Showing the report designer from a console application has been fixed 2020-01-09 21:22:58 +03:00
Alexander Arin
ca965db02a Second pass has been fixed 2019-12-27 20:19:58 +03:00
Alexander Arin
6a7180346c Crash on selection "use default connection" has been fixed 2019-12-19 23:40:32 +03:00
Alexander Arin
8328e0146b ChartItem has been fixed 2019-12-18 23:15:00 +03:00
Arin Alexander
464e0275ba Increased border size 2019-12-16 14:37:44 +03:00
wartime
8d6cf97a48 Increase line number for every group header 2019-12-15 14:23:50 +08:00
Arin Alexander
634a0c7eaa Default file name to save preview has been added 2019-12-11 15:01:02 +03:00
Arin Alexander
daef743d10 ChartItem has been fixed 2019-11-26 23:40:36 +03:00
Arin Alexander
a6a8c407a3 Russian translation has been updated 2019-10-17 00:11:27 +03:00
Arin Alexander
40726db745 Layout deletion has been fixed 2019-10-16 22:55:35 +03:00
Arin Alexander
2efe2afa72 Build fixed 2019-10-16 13:43:23 +03:00
Arin Alexander
e3981cfd88 Progress bars have been added to Design and Preview windows 2019-10-16 02:08:45 +03:00
Arin Alexander
ccec7b4164 Invalidating data sources have been improved 2019-10-16 02:06:38 +03:00
Arin Alexander
eaf921501f print process has been fixed 2019-10-14 23:47:14 +03:00
Arin Alexander
22bd808d2f build fixed 2019-10-13 15:12:20 +03:00
Arin Alexander
c543bb65f0 build for some compilers has been fixed 2019-10-13 14:28:39 +03:00
Arin Alexander
41bfc5ad71 cancelPrinting() slot has been fixed 2019-10-13 14:20:26 +03:00
Arin Alexander
86177820df cancelPrinting slot has been added 2019-10-12 23:25:30 +03:00
Arin Alexander
d36defd3dc version has been changed 2019-10-12 23:10:57 +03:00
Arin Alexander
544dbbf94e Merge branch 'master' into feature/speed_up 
# Conflicts:
#	limereport/lrbanddesignintf.cpp
#	limereport/lrreportengine.cpp
 2019-10-12 22:37:32 +03:00
Arin Alexander
5a6ee275a7 Some band improvements have been added. Printing signals have been added. Render & printing speed little bit has been increased 2019-10-12 22:31:35 +03:00
Arin Alexander
9756ddde9c Cache clearing has been added 2019-10-08 14:18:59 +03:00
Arin Alexander
9b914b05fd Group functions rendering has been optimized 2019-10-08 13:51:10 +03:00
Arin Alexander
076576ce88 setPageItems method has been fixed 2019-09-23 14:20:00 +03:00
Arin Alexander
5c7c9a1bac Items alignment tools has been refactored 2019-09-10 22:49:49 +03:00
Arin Alex
3b360e0f71 Qt4 build fixed 2019-09-09 22:33:13 +03:00
Arin Alex
fde44e67c1 Nested scripts have been fixed 2019-09-09 21:25:08 +03:00
Arin Alexander
fa795fe3ab Qt4 build has been fixed 2019-08-11 12:48:16 +03:00
Rodrigo Torres
c549035c76 Fix compilation 
Qt4 still have one remaining compiler error
 2019-08-10 18:45:27 -03:00
Arin Alexander
4556e3bc78 Image editor has been added 2019-08-07 21:06:47 +03:00
Arin Alexander
afa4bcb9bf If resourcePath contains a simple path to an image file, that image will be shown in design mode. 2019-08-07 12:40:42 +03:00
Arin Alexander
09e95cd633 Drawing of report items borders has been fixed 2019-07-31 00:28:45 +03:00
Arin Alexander
ae040f58bd Build fixed 2019-07-24 03:32:39 +03:00
fralx
74371c9af7
Update lrsqleditdialog.ui 2019-07-24 03:25:17 +03:00
Arin Alexander
1a10fc496e Translations has been fixed 2019-07-24 03:13:23 +03:00
Arin Alexander
c498d96862 CSV tab has been fixed 2019-07-23 18:15:32 +03:00
Arin Alexander
5cc1312dd9 Ruler ha been fixed 2019-07-23 17:06:07 +03:00
Arin Alexander
4fb39eaf35 Polish language has been added to the designer 2019-07-09 12:35:36 +03:00
Arin Alexander
e211838595 Edit mode toollbar has been removed for read only preview mode 2019-07-09 12:28:58 +03:00
Arin Alexander
afcdee3e24 Font editor has been fixed 2019-07-04 20:41:58 +03:00
Arin Alexander
e03175f678 dateFormat and dateTimeFormat functions have been improved 2019-07-01 17:01:55 +03:00
Arin Alexander
ca458dc9a8 Report default units setting parameter has been added 2019-06-30 22:00:01 +03:00
Arin Alexander
a70e84bf50 Locked items movement has been fixed 2019-06-30 12:41:07 +03:00
Arin Alexander
b8ac4de1fe hideIfEmpty initialization for BarcodeItem has been fixed 2019-06-29 18:40:55 +03:00
Arin Alexander
11cb534608 Fix: geometry changing for locked items is prevented 2019-06-29 18:11:00 +03:00
Arin Alexander
9bf0ba0ded Print process has been changed and printBehavior property has been added. 2019-06-28 23:42:35 +03:00
Arin Alexander
f7e1a383e9 geometryLocked property has been added to report items 2019-06-28 20:12:47 +03:00
Arin Alexander
99757097cc Turn off translation for object properties ability has been added to the object inspector 2019-06-28 13:08:33 +03:00
Arin Alexander
9a3af52cd7 hideIfEmpty property has been added to BarcodeItem 2019-06-28 10:27:09 +03:00
Arin Alexander
d79ca93d32 ShapeItem has been fixed 2019-06-27 23:37:06 +03:00
Arin Alexander
71256ccef6 ShapeItem has been fixed 2019-06-27 23:23:05 +03:00
Arin Alexander
69369e3b0c Ruler has been fixed 2019-06-27 10:45:26 +03:00
Arin Alexander
ac154dbc03 Ruler has been fixed 2019-06-26 02:23:12 +03:00
Arin Alexander
1991515fc5 Merge branch 'develop' into feature/Ruler 2019-06-26 00:25:59 +03:00
Arin Alexander
667a655e4a Rulers and inches support has been added 2019-06-26 00:24:40 +03:00
Arin Alexander
5aee8112a1 Test code has been removed 2019-06-22 00:21:45 +03:00
Arin Alexander
2b93c711fc Finish 1.4.136 
# Conflicts:
#	limereport/lrpageitemdesignintf.cpp
 2019-06-22 00:16:57 +03:00
Arin Alexander
0c4786582f relocateBands function has been fixed 2019-06-21 22:12:04 +03:00
Arin Alex
5f268a5b1a Typo has been fixed 2019-06-11 22:18:54 +03:00
Arin Alex
693e45d6d7 Some service signals have been renamed. 2019-06-11 21:55:59 +03:00
Arin Alex
9f00119fbc Typos have been fixed 2019-06-11 21:28:58 +03:00
Arin Alexander
1377a8b252 Redundant translations have been deleted 2019-06-07 00:27:28 +03:00
Arin Alex
b3d19d3a67 Printing prepared pages has been added 2019-06-03 22:30:50 +03:00
Arin Alexander
b929ac308b Translation build has been changed 2019-06-02 09:34:42 +03:00
Arin Alexander
e868616213 Finish 1.4.134 
# Conflicts:
#	limereport/lrreportrender.cpp
 2019-05-31 21:00:57 +03:00
Arin Alexander
bc1a6606b3 Page render has been fixed 2019-05-31 20:49:50 +03:00
Arin Alexander
89e899e660 es_ES changed to es 2019-05-29 23:03:22 +03:00
Arin Alexander
0245f5993a Finish 1.4.132 
# Conflicts:
#	include/lrpreviewreportwidget.h
#	include/lrreportengine.h
#	limereport/limereport.pri
#	limereport/limereport.pro
#	limereport/lrpreviewreportwidget.h
#	limereport/lrpreviewreportwindow.h
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine.h
#	limereport/lrreportengine_p.h
 2019-05-29 18:10:26 +03:00
Arin Alexander
536a409393 Prepared pages processing has been refactored 2019-05-29 16:32:58 +03:00
Arin Alexander
d9e609e954 Finish 1.4.131 
# Conflicts:
#	include/lrreportengine.h
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine.h
#	limereport/lrreportengine_p.h
 2019-05-29 04:05:10 +03:00
Arin Alexander
6a36f26128 Prepared pages processing has been added 2019-05-29 03:41:18 +03:00
Arin Alexander
70eb749c67 Light theme has been added 2019-05-26 15:15:06 +03:00
Arin Alexander
b34fb22b26 Finish 1.4.130 
# Conflicts:
#	limereport/objectinspector/lrobjectitemmodel.cpp
 2019-05-23 11:53:42 +03:00
Arin Alexander
3621051535 hideText & option3 translation 2019-05-23 11:52:31 +03:00
Arin Alexander
6b7abd4e8e Finish 1.4.129 2019-05-19 14:25:31 +03:00
Arin Alexander
0359127914 Option3 property has been added to BarcodeItem 2019-05-19 14:25:18 +03:00
Arin Alexander
3f0558f2e9 Merge branch 'master' into develop 
# Conflicts:
#	limereport/objectinspector/propertyItems/lrdatasourcepropitem.cpp
 2019-05-12 23:15:07 +03:00
Andrzej Woronko
add12675cc Adding barcode field from the data source 2019-05-10 12:52:17 +02:00
Andrzej Woronko
0049678a02 Add pl to .pro 2019-05-07 15:50:55 +02:00
Arin Alex
22c020569d fontLetterSpacing ready for translation 2019-05-05 11:07:27 +03:00
Arin Alex
356e48bee3 fontLetterSpacing property has been added to TextItem 2019-05-04 11:54:52 +03:00
Arin Alexander
13e3c3976c Finish 1.4.128 
# Conflicts:
#	limereport/items/lrimageitem.cpp
 2019-04-29 11:03:56 +03:00
Arin Alexander
a1af26eab3 Processing of resourcePath property in the ImageItem has been changed 2019-04-29 10:44:59 +03:00
Arin Alexander
271b765722 The rendering process, if the not sliced band is moved to a new page, has been changed 2019-04-16 16:59:35 +03:00
Arin Alexander
220dcc3edb Finish 1.4.127 
# Conflicts:
#	limereport/lrpageitemdesignintf.cpp
#	limereport/lrpageitemdesignintf.h
#	limereport/lrreportrender.cpp
 2019-04-16 01:06:51 +03:00
Arin Alexander
80e3a4dd64 Tear-off band relocation has been fixed 2019-04-16 00:41:05 +03:00
Arin Alexander
a68be66078 Merge branch 'master' into develop 
# Conflicts:
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine_p.h
 2019-04-15 14:20:44 +03:00
fralx
c2ac8bfec9
Merge pull request #174 from vanger13/master 
Added hiding (saving, printing, ...) buttons in the Render Report window
 2019-04-11 12:17:58 +03:00
Arin Alexander
6a32cdd58a Finish 1.4.126 2019-04-11 11:53:32 +03:00
Arin Alexander
a2b4fc55fe Report preview scrolling has been fixed 2019-04-11 11:50:52 +03:00
Segey
64fc4e5b4b Added hiding (saving, printing, ...) buttons in the Render Report window 2019-04-10 16:23:50 +03:00
Arin Alexander
602e8a82f6 Watermark has been fixed 2019-04-06 00:28:02 +03:00
Arin Alexander
c7a3517f11 Finish 1.4.125 2019-04-04 18:53:40 +03:00
Arin Alexander
fc68dadb04 Group functions have been fixed 2019-04-04 18:53:29 +03:00
Arin Alexander
93a9a00202 Build for Qt < 5.12 has been fixed 2019-04-04 17:16:38 +03:00
Arin Alexander
51b2effa3c Added ability to create CSV data source 2019-04-04 04:37:18 +03:00
Arin Alexander
de5cc0e0ca Anchor has been added to ItemGeometry 2019-04-02 22:56:12 +03:00
Arin Alexander
f1f1e443ac Added the ability to add watermarks to all reports. 2019-03-30 09:38:25 +03:00
Arin Alexander
68411d8002 QLineEdit has been changed to QPlainTextEdit in the variable editor dialog 2019-03-11 23:30:03 +03:00
Arin Alexander
a045c4fd0c PageDesignIntf has been fixed 2019-03-11 23:01:32 +03:00
Arin Alexander
ee77ad5e5f createPreviewScene(QObject *parent = 0); from now return QGraphicsScene* 2019-03-11 22:12:35 +03:00
Arin Alexander
5f56f36a49 addBookmark() && findPageIndexByBookmark() have been added to the script 2019-03-06 22:16:30 +03:00
Arin Alexander
c475159799 Finish 1.4.124 
# Conflicts:
#	limereport/lrbanddesignintf.h
#	limereport/lrpagedesignintf.cpp
#	limereport/lrpageitemdesignintf.h
#	translations/limereport_zh.ts
 2019-03-05 22:35:13 +03:00
Arin Alexander
6cad2bd6db Bands movement has been fixed 2019-03-04 22:33:01 +03:00
Arin Alexander
ed902b4ef1 Script editor has been changed for preview mode 2019-03-02 01:08:20 +03:00
Arin Alexander
424665d038 Band marker has been fixed 2019-03-02 00:29:18 +03:00
Arin Alexander
bf3e34677a Current page activation has been fixed 2019-03-01 23:54:41 +03:00
Arin Alexander
c6c5e2b206 Finished add new text item in preview mode 2019-03-01 23:48:28 +03:00
Arin Alexander
c7045ec1d6 Edit mode changed 2019-03-01 19:41:27 +03:00
Arin Alexander
ca57e5c195 Merge branch 'develop' into feature/addNewTextInPreview 
# Conflicts:
#	limereport/lrpagedesignintf.cpp
#	limereport/lrpagedesignintf.h
 2019-03-01 17:59:56 +03:00
Arin Alexander
8854f59916 Finish selection_and_preview_refactoring 2019-03-01 17:50:56 +03:00
Arin Alexander
76d542ce76 Selection marker has been fixed 2019-03-01 17:44:49 +03:00
Arin Alexander
ed28faf784 Default band's background filling mode changed to transparent 2019-03-01 17:32:48 +03:00
Arin Alexander
1bb6fc8f5a Band marker has been refactored 
Selection & join markers have been returned back
 2019-03-01 02:47:19 +03:00
Arin Alexander
1c2aed14f4 TableBuilder has been fixed 2019-02-27 22:34:34 +03:00
Arin Alexander
6ce77268fd Join & selection marker has been removed 2019-02-27 00:50:59 +03:00
Arin Alexander
f85b564808 Selection border painting has been fixed 2019-02-26 20:29:13 +03:00
Arin Alexander
005e65f3e3 Init commit 2019-02-25 16:22:10 +03:00
Arin Alexander
9bd392f4ac Lost headers moving has been fixed 2019-02-22 20:30:09 +03:00
Arin Alexander
78cac1126c TextItem placement on a page has been fixed 2019-02-21 22:44:43 +03:00
Arin Alexander
fed80a8be1 Preview printer initialization changed 2019-02-21 19:21:09 +03:00
Arin Alexander
b74a72531c Preview printer initialization changed 2019-02-21 19:15:31 +03:00
Arin Alexander
83a57b5cbe Added the ability to add text elements in preview (in edit mode) 2019-02-21 03:20:26 +03:00
Arin Alexander
c30bfc9a06 previewReport(QPrinter* printer, PreviewHints hints = PreviewBarsUserSetting) has been added to the report engine. 2019-02-20 13:54:26 +03:00
Arin Alexander
b5f2f50993 checkLostHeadersInPrevColumn() has been added 2019-02-19 15:44:23 +03:00
Arin Alexander
243fcc8fe3 Finish field_by_rowIndex 2019-02-19 03:07:02 +03:00
Arin Alexander
fdaee730ad Default preview background color has been changed 2019-02-19 03:02:46 +03:00
Arin Alexander
3bd49b6ffd getFieldByRowIndex() has been added 2019-02-19 02:43:16 +03:00
Arin Alexander
e0ef984fca Building for different script engine has been fixed 2019-02-19 02:23:53 +03:00
Arin Alexander
0a0e1504fa Script object naming has been fixed 2019-02-18 18:31:32 +03:00
Arin Alexander
b8900b1e96 Added the ability to change the background color of the preview page 2019-02-18 15:16:55 +03:00
Arin Alexander
4e91701387 ObjectInspector QPushButton -> QToolButton 2019-02-18 13:55:53 +03:00
Arin Alexander
2bbd963c18 currentObject -> object 2019-02-14 21:00:33 +03:00
Arin Alexander
deddd22eb4 Comments have been removed 2019-02-14 20:51:30 +03:00
Arin Alexander
4208b98f4a ObjectInspector has been wrapped by QWidget 2019-02-14 20:50:01 +03:00
Arin Alexander
5f9ee85dba Clear button has been added 2019-02-14 16:48:31 +03:00
Arin Alexander
7a512eca0b Property filter has been added 2019-02-14 00:21:57 +03:00
Arin Alexander
47ae56ab26 printerName has exported for translation 2019-02-12 23:07:24 +03:00
Arin Alexander
397005f010 Rendering pages has been fixed 2019-02-12 22:59:26 +03:00
Arin Alexander
3aee2b62d7 TOC Refactored 2019-02-12 22:45:35 +03:00
Arin Alexander
9be042819b Script editor has been fixed 2019-02-12 22:28:43 +03:00
Arin Alexander
edbba49114 Save and restore of Designer widget have been fixed 2019-02-12 22:28:16 +03:00
Arin Alexander
b839694e59 Print process has been fixed 2019-02-12 19:28:38 +03:00
Arin Alexander
e87b78030e Redundant code has been removed 2019-02-12 04:39:12 +03:00
Arin Alexander
d2ba19019b Print process has been fixed 2019-02-12 04:36:49 +03:00
Arin Alexander
8ba0449019 Layout spacing has been fixed 2019-02-10 04:50:40 +03:00
Arin Alexander
a43368751c printToAllPrinters flag has been added to printReport method 2019-02-09 23:57:19 +03:00
Arin Alexander
362c7217f3 Multi printers print process has been added 2019-02-07 01:14:16 +03:00
Arin Alexander
d85b8bbd87 Typo has been fixed 2019-02-06 20:46:38 +03:00
Arin Alexander
238ac7a103 Internationalization has been fixed 2019-02-06 19:09:32 +03:00
Arin Alexander
35cd54919a Layout spacing has been fixed 2019-02-06 18:41:56 +03:00
fralx
505f1398e3
Merge pull request #149 from f3nix/gcc-warnings-2 
Fix GCC 8 warning: catching polymorphic type by value [-Wcatch-value=]
 2019-02-06 00:30:24 +03:00
Arin Alexander
8a4daa889f Emitting band's signal preparedForRender has been fixed 2019-02-05 23:53:36 +03:00
Arin Alexander
867448d0fd Layout spacing property has been added to layouts 2019-02-05 23:25:18 +03:00
Arin Alexander
65a3a36770 TableBuilder has been fixed 2019-02-05 22:34:38 +03:00
Arin Alexander
87d0bd5f28 Changes tracking has been fixed 2019-02-05 21:51:46 +03:00
Arin Alexander
2ed1b4b05f TableBuilder has been fixed 2019-02-05 19:54:36 +03:00
Arin Alexander
5a5c9e76df DatasourceFunctions have been extended 2019-02-05 01:04:23 +03:00
Arin Alexander
d09ae57d0f New signal preparedForRender has been added to band 2019-02-05 01:00:32 +03:00
Arin Alexander
3cfd3c968f Abstract layout has been changed 2019-02-04 19:40:29 +03:00
Arin Alexander
72fb6692c6 Layouts have been refactored 2019-02-04 19:37:32 +03:00
Arin Alexander
d32b42d933 Finish ignore_priner_rect 2019-02-02 16:36:07 +03:00
Arin Alexander
14c1b56c83 Checking painter before render the report has been added 2019-02-01 21:59:37 +03:00
Arin Alexander
22dd686470 Some additional datasource management functions have been added 2019-01-31 22:30:41 +03:00
Arin Alexander
75878b97a9 Finish Variables_with_params 2019-01-31 22:17:05 +03:00
Arin Alexander
959aa60d46 Finish 1.4.123 2019-01-31 22:14:25 +03:00
Arin Alexander
64a49abdb2 Band size changing via keyboard has been fixed 2019-01-31 22:03:33 +03:00
Arin Alexander
568139aabf Merge branch 'develop' into feature/Variables_with_params 2019-01-31 21:15:13 +03:00
Arin Alexander
5bff155fa6 Finish 1.4.122 
# Conflicts:
#	limereport/lrdatasourcemanager.cpp
#	limereport/lrreportdesignwindow.cpp
#	limereport/lrreportengine.cpp
 2019-01-31 21:07:39 +03:00