 mandlm
|
3c059f134d
|
Merge branch 'release/subtest_1_block'
|
2019-01-31 20:23:55 +01:00 |
|
mandlm
|
af6316d3a2
|
Bumped version number
|
2019-01-31 20:23:08 +01:00 |
|
mandlm
|
d3ee95fdb8
|
Merge branch 'feature/block_structure_subtest_1' into develop
|
2019-01-31 20:22:15 +01:00 |
|
mandlm
|
8678fdb207
|
Split subtest 1 in four blocks
|
2019-01-31 20:20:48 +01:00 |
|
mandlm
|
a09e9a5351
|
Split subtest 1 into four widgets, extracted TPeModel
|
2019-01-30 23:07:11 +01:00 |
|
mandlm
|
d59176afdf
|
Merge branch 'master' into develop
|
2019-01-30 21:42:38 +01:00 |
|
mandlm
|
baf8532edf
|
Merge branch 'release/0.2'
|
2019-01-30 21:42:37 +01:00 |
|
mandlm
|
4e1f9dda79
|
Incremented version number to 0.2
|
2019-01-30 21:42:25 +01:00 |
|
mandlm
|
7c71733184
|
Added an about dialog with version info
|
2019-01-30 21:41:03 +01:00 |
|
mandlm
|
eff3b42cb0
|
Added version number and optional build number to build system
|
2019-01-30 21:23:26 +01:00 |
|
mandlm
|
f3249b8720
|
Prevent loading of foreign files
|
2019-01-30 20:41:22 +01:00 |
Michael Mandl
|
531554d124
|
Merge branch 'master' into develop
|
2019-01-30 08:53:40 +01:00 |
|
Michael Mandl
|
a479fa3581
|
Merge branch 'hotfix/parse-commandline-platform-independent'
|
2019-01-30 08:53:34 +01:00 |
|
Michael Mandl
|
b7beced1e5
|
Parse command line options platform (and encoding) independent
|
2019-01-30 08:53:19 +01:00 |
|
mandlm
|
6a267cb9b8
|
Merge branch 'master' into develop
|
2019-01-29 21:19:28 +01:00 |
|
mandlm
|
a8e1596868
|
Merge branch 'hotfix/save-dialog-says-open'
|
2019-01-29 21:19:26 +01:00 |
|
mandlm
|
f42d7eafb0
|
Label save-file-dialog button "Save" instead of "Open"
|
2019-01-29 21:19:05 +01:00 |
|
mandlm
|
20901898a8
|
Show and handle load and save errors
|
2019-01-29 20:55:16 +01:00 |
|
mandlm
|
9e6b957f92
|
Merge branch 'master' into develop
|
2019-01-29 20:15:01 +01:00 |
|
mandlm
|
2d88f4c08f
|
Merge branch 'hotfix/filename-encoding'
|
2019-01-29 20:14:59 +01:00 |
|
mandlm
|
542d2df992
|
Removed filename string conversion from loading/saving to avoid codepage
problems
|
2019-01-29 20:14:24 +01:00 |
|
Michael Mandl
|
34f52851f1
|
Merge branch 'feature/call-conan-from-cmake' into develop
|
2019-01-29 14:04:11 +01:00 |
|
Michael Mandl
|
8a0d2822fe
|
Merge branch 'master' into develop
|
2019-01-29 14:03:47 +01:00 |
|
Michael Mandl
|
1a4b40eaae
|
Merge branch 'hotfix/protoc-missing'
|
2019-01-29 14:03:45 +01:00 |
|
Michael Mandl
|
946ac43e5c
|
Added protoc to conan deps
|
2019-01-29 14:03:02 +01:00 |
|
Michael Mandl
|
88e75d2488
|
Install conan deps via cmake
|
2019-01-29 14:01:17 +01:00 |
|
mandlm
|
8444eda4ee
|
Merge branch 'master' into develop
|
2019-01-27 20:10:59 +01:00 |
|
mandlm
|
51937bb499
|
Merge branch 'hotfix/over-aged-subjects'
|
2019-01-27 20:10:58 +01:00 |
|
mandlm
|
c044bebece
|
Use the maximum test-age for subjects past that age
|
2019-01-27 20:10:11 +01:00 |
|
mandlm
|
6cd13ad94b
|
Merge branch 'master' into develop
|
2019-01-27 18:29:47 +01:00 |
|
mandlm
|
97192b6190
|
Merge branch 'hotfix/subtest-4-labels'
|
2019-01-27 18:29:30 +01:00 |
|
mandlm
|
fc9e387b28
|
Changed name and datamodel of subtest 4 / dativ options
Fixes #19
|
2019-01-27 18:28:39 +01:00 |
|
Michael Mandl
|
95fc970488
|
Disabled unit tests
|
2019-01-24 21:09:00 +01:00 |
mandlm
|
e5232aee9d
|
Merge pull request #18 from mandlm/develop
Develop
|
2019-01-24 20:21:06 +01:00 |
|
mandlm
|
bdf9706e58
|
Added pdf export
|
2018-12-09 11:11:55 +01:00 |
|
mandlm
|
f38b9194fd
|
Renamed LogoTest.cpp to ESGRAF48.cpp
|
2018-12-08 16:39:33 +01:00 |
|
mandlm
|
4fefdc65c5
|
Open first command line argument as file
|
2018-12-02 15:22:44 +01:00 |
|
mandlm
|
458de36cbc
|
Merge branch 'feature/add-unittests' into develop
|
2018-11-25 14:32:40 +01:00 |
|
mandlm
|
220f92453d
|
Added more Age-class tests
|
2018-11-25 14:30:45 +01:00 |
|
mandlm
|
09f8fa4faf
|
Added some more tests
|
2018-11-24 20:08:01 +01:00 |
|
mandlm
|
a2b85eba83
|
Added Catch2 tests, moved Age-class to own library
|
2018-11-24 19:55:16 +01:00 |
|
mandlm
|
3002cb4a03
|
Merge branch 'develop'
|
2018-11-21 21:41:55 +01:00 |
|
mandlm
|
d1d635bd95
|
Append default file extension when saving without one
|
2018-11-21 21:40:59 +01:00 |
|
mandlm
|
4c7285a64a
|
Merge branch 'develop'
|
2018-11-21 18:15:39 +01:00 |
|
mandlm
|
611e34fc5e
|
Link protobuf statically
|
2018-11-21 18:15:20 +01:00 |
|
mandlm
|
a444551e6d
|
Merge pull request #17 from mandlm/develop
Develop
|
2018-11-21 08:28:52 +01:00 |
|
mandlm
|
188f33c736
|
Use protobuf conan package
|
2018-11-20 23:05:49 +01:00 |
|
mandlm
|
ef5686e83e
|
Renamed read/writeProtoBuf to read/write
|
2018-11-20 22:15:09 +01:00 |
|
mandlm
|
5a88e99a15
|
Merge branch 'develop'
|
2018-11-18 21:34:10 +01:00 |
|
mandlm
|
6f35ffda7f
|
Merge branch 'feature/save-to-protobuf' into develop
|
2018-11-18 21:33:24 +01:00 |