| 
							
							
								 Arin Alex | bd7bea989e | Merge branch 'master' into develop # Conflicts:
#	3rdparty/zint-2.4.4/backend_qt4/Zint.pro
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
#	designer/designer.pro
#	limereport/limereport.pro
#	translations/limereport_ar.ts
#	translations/limereport_es_ES.qm
#	translations/limereport_es_ES.ts
#	translations/limereport_fr.ts
#	translations/limereport_ru.qm | 2018-03-13 15:23:47 +03:00 |  | 
			
				
					| 
							
							
								 fralx | dea9d2a32a | Merge pull request #99 from Crystal-Photonics/master the created dlls which are built as debug have a "d" suffix | 2018-03-13 13:50:12 +03:00 |  | 
			
				
					| 
							
							
								 arne krüger | 996d3ff16a | -zint dll is now created | 2018-03-12 19:21:34 +01:00 |  | 
			
				
					| 
							
							
								 arne krüger | e95dea2146 | -translations | 2018-03-09 19:12:39 +01:00 |  | 
			
				
					| 
							
							
								 arne krüger | 85f4fcf7ae | Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport # Conflicts:
#	3rdparty/zint-2.4.4/backend_qt4/Zint.pro
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
#	designer/designer.pro
#	translations/limereport_ru.ts | 2018-03-09 19:01:07 +01:00 |  | 
			
				
					| 
							
							
								 arne krüger | da9099cecb | -target names for debug built dlls have now a "d" suffix | 2018-03-09 18:33:59 +01:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 0b33603270 | Finish 1.4.67 | 2018-03-07 20:04:45 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 608ae6cda6 | Finish 1.4.67 | 2018-03-07 20:04:45 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 215af87910 | memory leak fixed | 2018-03-07 20:04:30 +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 Alex | c406920206 | Printable property has been added to PageItem | 2018-03-07 19:50:52 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 32d8581672 | memory leak fixed | 2018-03-07 19:46:23 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 5d7a116f31 | Disable the context menu for non-editable items | 2018-03-02 22:22:51 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 17aac3789e | Disable the context menu for non-editable items | 2018-03-02 22:22:51 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 9673e7ed20 | Disable the context menu for non-editable items | 2018-03-02 22:22:33 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alexander | 6ad35d63be | Easyprofiler added | 2018-02-28 23:19:14 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | edb89544f8 | Merge branch 'master' into develop | 2018-02-26 23:18:39 +03:00 |  | 
			
				
					| 
							
							
								 fralx | d8df465f18 | Merge pull request #97 from wartime/master Add Chinese translation | 2018-02-26 09:05:45 +03:00 |  | 
			
				
					| 
							
							
								 weibt | e08e7b4339 | Add Chinese translation | 2018-02-25 13:33:17 +08:00 |  | 
			
				
					| 
							
							
								 Arin Alex | d1f4a15321 | ReportPage item propagate to script engine has been fixed Completer has been refactored | 2018-02-15 02:21:00 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 04bf1dfbdb | Redundant saveToFile() has been removed | 2018-02-07 22:43:31 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alexander | 5b81a75d3c | ScriptEngineContext fixed | 2018-01-26 18:04:58 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alexander | f8eb1ceb97 | Finish 1.4.65 | 2018-01-26 17:38:36 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alexander | 0d3086d944 | Finish 1.4.65 | 2018-01-26 17:38:35 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alexander | 8e1f99d4b9 | ScriptManager fixed | 2018-01-26 17:38:23 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 02ad375017 | Hide & Show DocWidgets fixed | 2018-01-24 20:59:53 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | cc8fcc52f3 | Finish 1.4.64 | 2018-01-24 00:22:53 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 7c341c374d | Finish 1.4.64 | 2018-01-24 00:22:50 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 931e598bec | Hide panel shortcuts added | 2018-01-24 00:22:32 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | f326e0a914 | Finish 1.4.63 | 2018-01-23 23:06:45 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 34c75978a0 | Finish 1.4.63 | 2018-01-23 23:06:41 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | a5fe4987af | Version changed | 2018-01-23 23:06:26 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 58ef51ffe2 | Context menu added to band marker | 2018-01-23 23:05:32 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | b2278e4944 | removed redundant showDefaultEditors() | 2018-01-23 22:13:57 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | f861e32c45 | Static build fixed | 2018-01-23 21:48:12 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 4ed437a6d0 | Finish 1.4.62 | 2018-01-23 21:02:14 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | b3c98dcee0 | Finish 1.4.62 | 2018-01-23 21:02:10 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 243983127d | Version changed | 2018-01-23 21:01:54 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 6693b33926 | keepBottomSpace fixed | 2018-01-23 20:53:53 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | ac31a60c75 | Finish 1.4.61 | 2018-01-23 02:15:02 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | e7381c8d2f | Finish 1.4.61 | 2018-01-23 02:15:02 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alex | 0ffc593a65 | splitting fixed | 2018-01-23 02:14:43 +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 | 567228325d | Finish 1.4.60 | 2018-01-18 21:44:22 +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 | 09a1edd108 | Group bands have been fixed Port property has been added to connection describer | 2018-01-18 20:30:29 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alexander | a80a1298eb | Group band has been fixed | 2018-01-18 20:28:56 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alexander | f64a918ffe | Port property has been added to connection describer | 2018-01-18 20:13:18 +03:00 |  | 
			
				
					| 
							
							
								 Arin Alexander | d44a579e92 | FontEditor has been fixed | 2018-01-14 21:33:15 +03:00 |  |