Arin Alex
|
00b30be295
|
Merge branch 'master' into 1.4
Conflicts:
common.pri
|
2016-12-07 20:41:04 +03:00 |
|
Arin Alex
|
a73bc90417
|
travis build: ppa:beineri/opt-qt561-trusty --> ppa:beineri/opt-qt562-trusty
|
2016-12-07 20:35:56 +03:00 |
|
lchauvinQt
|
80fa86a3ca
|
Fix random crash while scrolling into the viewer, avoid the index out of range when the " m_currentPage " is not valid
|
2016-12-06 16:28:28 +01:00 |
|
Arin Alexander
|
114e690541
|
travis build: ppa:beineri/opt-qt561-trusty --> ppa:beineri/opt-qt562-trusty
|
2016-12-06 01:08:30 +03:00 |
|
Arin Alexander
|
6d31f20566
|
OneSlotDS has been added to demo_r1
|
2016-12-06 00:27:22 +03:00 |
|
Arin Alexander
|
bca1019803
|
Path to database has been fixed
|
2016-12-06 00:27:21 +03:00 |
|
Arin Alexander
|
54562d80cd
|
checkIfEmpty has been refactored
|
2016-12-06 00:27:21 +03:00 |
|
Arin Alexander
|
229e8f529d
|
resourcePath property has been added to ImageItem
|
2016-12-06 00:27:09 +03:00 |
|
Arin Alexander
|
21e3a6fbf9
|
Release version has been changed
|
2016-11-26 00:50:30 +03:00 |
|
Arin Alexander
|
eac1a029d9
|
Merge branch '1.4_followTo' into 1.4
|
2016-11-25 23:54:36 +03:00 |
|
Arin Alexander
|
dc5ee3d98b
|
Debug messages have been removed
|
2016-11-25 23:54:23 +03:00 |
|
Arin Alexander
|
151ae9d73d
|
Merge branch '1.4' into 1.4_followTo
|
2016-11-25 23:11:15 +03:00 |
|
Arin Alexander
|
819cc8a1c3
|
Merge branch '1.4' into 1.4_followTo
# Conflicts:
# limereport/items/lrtextitem.cpp
|
2016-11-25 22:41:28 +03:00 |
|
Arin Alexander
|
b4dea2fcfd
|
New demo reports have been added
|
2016-11-18 01:14:01 +03:00 |
|
Arin Alexander
|
61653c9bb3
|
Calculated condition has been added to group band header
|
2016-11-18 01:12:23 +03:00 |
|
Arin Alexander
|
43bff192a9
|
Merge branch '1.4' into 1.4_QJSEngine
|
2016-11-17 00:50:52 +03:00 |
|
Arin Alexander
|
e9b32ec7d7
|
Version has been changed
|
2016-11-17 00:50:36 +03:00 |
|
Arin Alexander
|
7986fda128
|
Merge branch '1.4' into 1.4_QJSEngine
|
2016-11-17 00:42:24 +03:00 |
|
Arin Alexander
|
65d7bc7774
|
Merge branch 'master' into 1.4
|
2016-11-17 00:38:00 +03:00 |
|
Arin Alexander
|
2fb47a5830
|
Connect connection has been refactored
|
2016-11-17 00:37:37 +03:00 |
|
Arin Alex
|
33959d3882
|
Icons have been changed
|
2016-11-16 01:31:06 +03:00 |
|
Arin Alex
|
32620ef918
|
Merge branch '1.4' into 1.4_QJSEngine
|
2016-11-08 01:10:05 +03:00 |
|
Arin Alex
|
71aaaac34d
|
Merge branch 'master' into 1.4
|
2016-11-08 01:09:54 +03:00 |
|
Arin Alex
|
0055790bcd
|
setDefaultDatabasePath() has been added to DataSourceManager
|
2016-11-08 01:09:35 +03:00 |
|
Arin Alex
|
6127db13e6
|
Merge branch '1.4' into 1.4_ChartItem
Conflicts:
limereport/items/items.qrc
|
2016-11-07 20:23:47 +03:00 |
|
Arin Alex
|
b04c1a2670
|
Merge branch '1.4' into 1.4_QJSEngine
|
2016-11-07 20:21:32 +03:00 |
|
Arin Alex
|
be67e6309b
|
pri file has been refactored
pri file refactored
|
2016-11-07 20:19:09 +03:00 |
|
Arin Alex
|
9fe00a0e41
|
Merge branch 'master' into 1.4
|
2016-11-07 20:18:49 +03:00 |
|
Arin Alexander
|
85550995b6
|
Merge branch '1.4' into 1.4_QJSEngine
|
2016-11-05 18:13:07 +03:00 |
|
Arin Alexander
|
0bfff7cb00
|
Merge branch 'master' into 1.4
|
2016-11-05 18:12:41 +03:00 |
|
Arin Alexander
|
77b151a788
|
Insert mode is canceled when band inserted
|
2016-11-05 18:12:10 +03:00 |
|
Arin Alexander
|
47b5aca63a
|
Merge branch '1.4' into 1.4_QJSEngine
|
2016-11-05 00:48:39 +03:00 |
|
Arin Alexander
|
fbb9ac47af
|
Merge branch 'master' into 1.4
# Conflicts:
# translations/limereport_es_ES.qm
# translations/limereport_es_ES.ts
# translations/limereport_ru.qm
# translations/limereport_ru.ts
|
2016-11-05 00:39:51 +03:00 |
|
Arin Alexander
|
8c09e5ed51
|
Images has been changed
|
2016-11-05 00:37:33 +03:00 |
|
Arin Alexander
|
97c1eb3f77
|
Dialogs for QJSEngine has been fixed. Child objects registration has been added
|
2016-11-04 21:42:15 +03:00 |
|
Arin Alexander
|
5b95b9b3d6
|
followTo has been added
followTo has been added
|
2016-11-04 01:25:46 +03:00 |
|
Arin Alexander
|
04745def1e
|
TextItem splitting has been fixed
|
2016-11-04 01:24:03 +03:00 |
|
Arin Alex
|
cf1b2a4146
|
qjsengine and uitools are switched on
|
2016-11-02 14:54:36 +03:00 |
|
Arin Alex
|
db87e5dc9e
|
Build with uitools has been fixed
|
2016-11-02 11:15:05 +03:00 |
|
Arin Alex
|
7c02c77aaf
|
CharItem has been added
|
2016-11-02 01:34:45 +03:00 |
|
Arin Alex
|
9d82ac19ee
|
Merge branch 'master' into 1.4
|
2016-11-02 00:58:50 +03:00 |
|
Arin Alex
|
c786be0ca4
|
pri file has been refactored
pri file refactored
|
2016-11-02 00:57:55 +03:00 |
|
Arin Alex
|
4520347dbe
|
Merge branch '1.4' into 1.4_QJSEngine
|
2016-11-01 22:32:12 +03:00 |
|
Arin Alex
|
f01c586926
|
Merge branch 'master' into 1.4
|
2016-11-01 22:32:02 +03:00 |
|
Arin Alex
|
bb6e934152
|
Band background color has been fixed
|
2016-11-01 22:31:48 +03:00 |
|
Arin Alex
|
2034aa15c8
|
QJSEngine has been added
|
2016-11-01 20:42:45 +03:00 |
|
Arin Alex
|
3bf993eb5a
|
Merge branch 'master' into 1.4
|
2016-11-01 20:07:30 +03:00 |
|
Arin Alex
|
724e3c004c
|
TextItem has been fixed
|
2016-11-01 20:07:10 +03:00 |
|
Arin Alexander
|
16605c1414
|
Merge branch 'master' into 1.4
|
2016-11-01 14:56:18 +03:00 |
|
Arin Alexander
|
c623932afb
|
Object inspector has been fixed
|
2016-11-01 14:56:06 +03:00 |
|