mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2026-10-13 16:47:05 +03:00
Code Activity
1,908 Commits 13 Branches 208 Tags
18e4131fc169c54643f3a826643b18876d8306c7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Arin Alex 18e4131fc1 Merge branch 'master' into develop 2025-11-18 23:09:10 +03:00
Arin Alex 0fbcd7edb4 Finish 1.7.19 2025-11-18 23:08:35 +03:00
Arin Alex 0e05376fc6 1_simple_list has been fixed 2025-11-18 23:07:49 +03:00
Alexander Arin 6943c356b2 Merge pull request #481 from tizbac/fixcmakesubdir 
Fix generating version.h.in when project is used as subdirectory
 2025-08-26 17:32:36 +03:00
Alexander Arin a0b03105b3 Update cmake.yml 2025-07-29 13:30:39 +03:00
Alexander Arin 558d3c9e0c Update cmake.yml 2025-07-29 13:28:15 +03:00
Alexander Arin 5181f977ec Update cmake.yml 2025-07-29 13:21:52 +03:00
Arin Alex 05dd4e8a1a Merge tag '1.7.18' into develop 
Finish 1.7.18
 2025-07-27 19:00:00 +03:00
Arin Alex c1a96b32c9 Finish 1.7.18 2025-07-27 19:00:00 +03:00
Arin Alex 2b20232384 Windows build has been fixed 2025-07-27 17:41:20 +03:00
Alexander Arin 34d68b1050 Windows 2019 has been removed 2025-07-23 17:14:57 +03:00
Alexander Arin 79ca779560 Ubuntu 20 has been removed 2025-07-23 17:12:50 +03:00
Arin Alex de3eb23650 Merge fix 2025-06-25 19:42:42 +03:00
Arin Alex 409a12c8ef Merge tag '1.7.17' into develop 
Finish 1.7.17
 2025-06-25 19:38:35 +03:00
Arin Alex 09ab013518 Finish 1.7.17 2025-06-25 19:23:10 +03:00
Arin Alex 8e439f2cf1 Barcode types has been fixed 2025-06-25 19:11:32 +03:00
Alexander Arin 33ebdfc640 Merge pull request #475 from xakod/feature/cmake_dialog_designer-update 
cmake: add options ENABLE_DIALOG_DESIGNER and HAVE_UI_LOADER
 2024-10-23 15:30:27 +03:00
Alexander Arin 731c05454d Merge pull request #474 from aol-nnov/version-generator-followup 
Fix qmake version generator
 2024-09-20 17:41:55 +03:00
Alexander Arin 1ca70bbf8b Merge pull request #472 from aol-nnov/define-codestyle 
Define codestyle
 2024-09-19 23:41:24 +03:00
Arin Alex ffce341ce1 Merge tag '1.7.15' into develop 
Finish 1.7.15

# Conflicts:
#	console/main.cpp
 2024-09-19 20:19:50 +03:00
Arin Alex 472781cbe4 Finish 1.7.15 2024-09-19 20:04:27 +03:00
Arin Alex 8e3cae45e3 Translations state committed 2024-09-19 20:04:19 +03:00
Alexander Arin c5b9ac265d Merge pull request #471 from aol-nnov/automate-version-generation 
Automate version generation
 2024-09-19 19:22:50 +03:00
Alexander Arin a9126d51c6 Merge pull request #470 from aol-nnov/update-gitignore 
Add canonical ignore rules from gitignore.io
 2024-09-17 19:36:14 +03:00
Arin Alex 7bef0e2c29 Merge tag '1.7.14' into develop 
Finish 1.7.14
 2024-07-31 20:04:48 +03:00
Arin Alex 5a23da464f Finish 1.7.14 2024-07-31 20:04:48 +03:00
Arin Alex e53e7a993b #467 Fixed 2024-07-31 20:04:27 +03:00
Alexander Arin f07a356899 removed build for macos 11 2024-07-26 16:44:29 +03:00
Arin Alex 08eb527165 Merge tag '1.7.13' into develop 
Finish 1.7.13
 2024-07-25 21:44:18 +03:00
Arin Alex a1937e6101 Finish 1.7.13 2024-07-25 21:44:18 +03:00
Arin Alex 3de208b589 bool setDefaultExportDir(const QString& dirname) has been added 2024-07-25 21:44:11 +03:00
Arin Alex 32a78bbe8e Merge tag '1.7.12' into develop 
Finish 1.7.12
 2024-07-25 18:36:45 +03:00
Arin Alex 570aaa734f Finish 1.7.12 2024-07-25 18:36:45 +03:00
Arin Alex f171b906eb Comments have been removed 2024-07-25 18:36:41 +03:00
Arin Alex 66f1e6434f Merge tag '1.7.11' into develop 
Finish 1.7.11
 2024-07-25 18:32:44 +03:00
Arin Alex 7c7157417a Finish 1.7.11 2024-07-25 18:32:44 +03:00
Arin Alex 9de9cc3ebf Layout undo has been fixed 2024-07-25 18:32:30 +03:00
Arin Alex c082122c70 Merge tag '1.7.10' into develop 
Finish 1.7.10
 2024-07-24 22:45:08 +03:00
Arin Alex f3d2efe8ca Finish 1.7.10 2024-07-24 22:45:08 +03:00
Arin Alex d97e7e9abe Default item paddings have been added to report settings. 2024-07-24 22:44:58 +03:00
Arin Alex 09780a4759 Merge tag '1.7.9' into develop 
Finish 1.7.9
 2024-07-18 21:47:06 +03:00
Arin Alex e833461923 Finish 1.7.9 2024-07-18 21:47:06 +03:00
Arin Alex 5e17afb5de currentReportsDir using fixed 2024-07-18 21:46:54 +03:00
Arin Alex 6f3b1ba989 Merge tag '1.7.8' into develop 
Finish 1.7.8
 2024-06-06 22:44:47 +03:00
Arin Alex b4b2da8330 Finish 1.7.8 2024-06-06 22:44:47 +03:00
Arin Alex 0d12ce50e5 Background color rendering has been fixed 2024-06-06 22:44:02 +03:00
Arin Alex ee418b048a Merge tag '1.7.7' into develop 
Finish 1.7.7
 2024-05-08 17:46:25 +03:00
Arin Alex 86df3b179a Finish 1.7.7 2024-05-08 17:46:25 +03:00
Arin Alex 8a09d5adcd Redundant item creator registration has been fixed 2024-05-08 17:46:13 +03:00
arin.alex 727a72a8dc Merge tag '1.7.7' into develop 
Finish 1.7.7
 2024-03-31 15:20:20 +03:00
arin.alex caf9f3867d Finish 1.7.7 2024-03-31 15:20:20 +03:00
arin.alex e6321e36fb Printing big pages has been fixed 2024-03-31 15:20:09 +03:00
Alexander Arin 5139ac0ab0 Merge pull request #452 from DmitryZagorodnev/feature/dataRoles 
Feature/data roles
 2024-03-30 14:16:02 +03:00
Arin Alex 95804d40f9 Merge tag '1.7.6' into develop 
Finish 1.7.6
 2024-01-14 21:08:53 +03:00
Arin Alex 0007495fe5 Finish 1.7.6 2024-01-14 21:08:53 +03:00
Arin Alex 98e181b158 addCSV has been added to IDataSourceManager 2024-01-14 21:08:34 +03:00
Alexander Arin d10a627976 Merge pull request #446 from python-LimeReport/chore/update-version-info 
chore: update version info
 2023-09-08 16:07:14 +03:00
Arin Alex ae929feddb Merge tag '1.7.5' into develop 
Finish 1.7.5
 2023-08-16 16:04:02 +03:00
Arin Alex f73342dc20 Finish 1.7.5 2023-08-16 16:04:02 +03:00
Arin Alex f097b89280 Updated Russian translation. 2023-08-16 14:15:01 +03:00
Arin Alex 4f6bd2497c Merge tag '1.7.4' into develop 
Finish 1.7.4
 2023-05-01 09:26:49 +03:00
Arin Alex 6a623a9ecb Finish 1.7.4 2023-05-01 09:26:49 +03:00
Arin Alex f1903147a6 return value has been fixed 2023-05-01 09:26:41 +03:00
Alexander Arin 289ad33c07 Merge pull request #436 from mandauhitam/patch-1 
Update qzint.h on <QObject>
 2023-04-28 19:55:58 +03:00
Arin Alexander 1abe679a77 Merge tag '1.7.3' into develop 
Finish 1.7.3
 2023-04-11 13:40:12 +03:00
Arin Alexander 491b78752c Finish 1.7.3 2023-04-11 13:40:12 +03:00
Arin Alexander a7cdb28b4a Keep bottom space has been fixed 2023-04-11 13:39:54 +03:00
Arin Alex 7e46851805 Merge tag 'version/1.7.2' into develop 
Finish version/1.7.2
 2023-02-07 19:21:29 +03:00
Arin Alex a969d3452b Finish version/1.7.2 2023-02-07 19:21:29 +03:00
Arin Alex 0b830069b2 fix build for c++ < 17 2023-02-07 18:44:00 +03:00
Arin Alex a9ff344677 Merge tag 'version/1.7.1' into develop 
Finish version/1.7.1
 2023-02-07 01:02:28 +03:00
Arin Alex 4f5c27817c Finish version/1.7.1 2023-02-07 01:02:28 +03:00
Arin Alex 772a15b867 Temporary removed information label (it should be redesigned) 2023-02-07 01:02:21 +03:00
Arin Alex b6e4610779 Merge tag 'version/1.7.0' into develop 
Finish version/1.7.0

# Conflicts:
#	limereport/report.qrc
 2023-02-07 00:34:52 +03:00
Arin Alex 8ed3fb6344 Finish version/1.7.0 2023-02-07 00:33:27 +03:00
Arin Alex 4bb82ffa52 fix build for c++ < 17 2023-02-07 00:32:58 +03:00
Alexander Arin 9af5af74b3 Merge pull request #428 from rangemastersystems/master 
Fix: ReportEnginePrivate::exportReport Не работал экспорт при пустом
 2023-02-02 11:29:07 +03:00
Alexander Arin 3fbedf0860 Merge pull request #427 from yanis60/master 
added position info when dragging
 2023-02-02 11:28:26 +03:00
Alexander Arin d354c8f4c9 Merge pull request #426 from Jihadist/build-fixes 
Build fixes
 2023-01-18 22:58:47 +03:00
Alexander Arin 74758e035b Merge pull request #424 from Jihadist/patch-1 
Fix cmake_minimum_required
 2023-01-11 00:47:48 +03:00
Alexander Arin 4cbb1a1e66 Merge pull request #425 from yanis60/master 
Page free space calculation has been updated
 2023-01-11 00:47:31 +03:00
Alexander Arin f202c57a43 Merge pull request #421 from Jihadist/feature/cmake-doc 
Update readme for cmake
 2022-11-09 16:51:28 +03:00
Alexander Arin fe81e314d3 Finish 1.6.9 2022-11-01 13:30:15 +03:00
Alexander Arin 2aaf467dc1 Cmake fixed 2022-11-01 13:29:52 +03:00
Alexander Arin 09873390e2 Finish 1.6.8 2022-11-01 13:23:09 +03:00
Alexander Arin 934e31ec1c Cmake fixed 2022-11-01 13:22:20 +03:00
Alexander Arin 29c449e14f Finish refactor_border_editor 2022-11-01 12:48:42 +03:00
Alexander Arin 9ce8294976 Merge branch 'master' into feature/refactor_border_editor 2022-11-01 12:48:29 +03:00
Alexander Arin 44d31243ab Border editor little bit refactored 2022-11-01 11:48:47 +03:00
Alexander Arin 33dce7ef27 Merge pull request #417 from rangemastersystems/master 
Add ImageItem::isEmpty, Fix: ImageItem::paint
 2022-11-01 11:45:20 +03:00
Alexander Arin 7bf0ce51e6 Border editor refactoring 2022-10-31 21:20:24 +03:00
Alexander Arin b1c67651c8 Merge pull request #418 from Jihadist/master 
Github actions update
 2022-10-31 21:15:22 +03:00
Alexander Arin ba9abc7877 Merge pull request #398 from yanis60/master 
improved borders
 2022-10-26 01:20:33 +03:00
Alexander Arin adc74053e3 Update README.md 
travis badge removed
 2022-10-12 18:46:15 +03:00
Alexander Arin 9c5a219ceb Update README.md 
cmake badge added
 2022-10-12 18:33:07 +03:00
Alexander Arin 6f58847785 Update README.md 
cmake badge added
 2022-10-12 18:31:07 +03:00
Alexander Arin 3361113946 Update README.md 
cmake bage added
 2022-10-12 18:27:39 +03:00
Alexander Arin 710626c6c8 Merge pull request #410 from Jihadist/master 
Create github actions pipeline
 2022-10-12 01:56:32 +03:00
Alexander Arin 40073d6eb3 Merge tag '1.6.7' into develop 
Finish 1.6.7
 2022-08-23 01:31:26 +03:00
Alexander Arin f359509a32 Finish 1.6.7 2022-08-23 01:31:24 +03:00