Commit Graph

436 Commits

Author SHA1 Message Date
Jonas Mucke
42c5078e65 Merge branch 'dev' into 'master'
Dev

See merge request creyd/intelliphoto!51
2020-01-16 20:36:16 +00:00
Jonas Mucke
5b94ffda3c Merge branch 'dev-GUI-Update' into 'dev'
Dev gui update

See merge request creyd/intelliphoto!50
2020-01-16 20:31:51 +00:00
AshBastian
67e51c27a2 GUI Update 4 2020-01-16 21:21:47 +01:00
AshBastian
c16a589a66 GUI Update 3 2020-01-16 21:19:17 +01:00
Jonas Mucke
784e9c051e cmath 2020-01-16 18:54:55 +01:00
Jonas Mucke
3b952ed087 Merge branch 'dev-docs' into 'dev'
Dev docs

See merge request creyd/intelliphoto!49
2020-01-16 17:49:31 +00:00
Jonas Mucke
92e6b569ea math 2020-01-16 18:48:53 +01:00
Jonas Mucke
c7aae58f8e Merge branch 'dev-docs' of https://gitlab.com/creyd/intelliphoto into dev-docs 2020-01-16 18:46:17 +01:00
Jonas Mucke
3d5a4c0430 Merge branch 'dev' into dev-docs 2020-01-16 18:46:03 +01:00
Paul Norberger
e4543dbe03 Started updating screenshots 2020-01-16 18:39:08 +01:00
Paul Norberger
c77507422c Volere Snow Cards Update 2020-01-16 18:37:33 +01:00
AshBastian
753a491695 GUI Update 2 2020-01-16 17:36:52 +01:00
AshBastian
332e752371 GUI Update 1 2020-01-16 17:22:19 +01:00
Jonas Mucke
b03270704c Merge branch 'dev-warnings' into 'dev'
Dev warnings

See merge request creyd/intelliphoto!45
2020-01-16 15:53:36 +00:00
Jonas Mucke
42a765642a Merge branch 'canvas' into 'dev'
Canvas

See merge request creyd/intelliphoto!47
2020-01-16 15:51:43 +00:00
Jonas Mucke
2f5a389d46 Merge branch 'dev' into canvas 2020-01-16 16:50:16 +01:00
Jonas Mucke
cb06e10fcd Update IntelliPhotoGui.cpp 2020-01-16 16:49:59 +01:00
Jonas Mucke
c73b481ec7 layer as canvas 2020-01-16 16:49:55 +01:00
Mienek
58f679a0b6 added Dimension
added the change and get dimesions stuff
2020-01-16 16:35:30 +01:00
Paul Norberger
44c06d65fc Finalize CRC cards 2020-01-16 15:10:25 +01:00
Paul Norberger
67d4a50074 Update todo files 2020-01-16 15:08:55 +01:00
Paul Norberger
fa53f6f008 Document reference system 2020-01-16 15:07:52 +01:00
Paul Norberger
1412f44b8e Add plain tool icon 2020-01-16 15:06:40 +01:00
Paul Norberger
2f0c00def2 Add uses cases to documentation 2020-01-16 14:52:04 +01:00
Paul Norberger
6006fad5d8 Updated line tool icon 2020-01-16 14:51:23 +01:00
Jan Schuffenhauer
abe63d3862 fixed every known warning from cppcheck
done.
2020-01-16 14:21:16 +01:00
Jan Schuffenhauer
b055c0b922 Automated Release Preparation 2020-01-16 12:52:25 +01:00
Jan Schuffenhauer
d60796ccae Automated Release Preparation 2020-01-16 12:38:47 +01:00
Jan Schuffenhauer
8fcc5f04e8 Some cleanup of Includes 2020-01-16 12:31:33 +01:00
Jan Schuffenhauer
f5f4ca7a06 Automated Release Preparation 2020-01-16 12:21:09 +01:00
Jan Schuffenhauer
cd3ba27e8d Merge branch 'dev' into dev-warnings 2020-01-16 12:18:33 +01:00
Jan Schuffenhauer
5de1e7f83a Merge branch 'UnitTesting' into dev 2020-01-16 12:11:37 +01:00
8d32a5e3bb Merge branch 'dev-rework' into dev 2020-01-16 12:46:29 +01:00
25deefdcb9 Stopped Unit Test Automation as it doesn't work yet 2020-01-16 12:45:55 +01:00
f2e64e375b Added Unit Tests to prep script 2 2020-01-16 12:39:59 +01:00
855dd23b39 Added Unit Tests to prep script 2020-01-16 12:24:21 +01:00
a6a2a922a5 Automated Release Preparation 2020-01-16 12:17:31 +01:00
3359975b1f Merge branch 'dev-rework' into dev 2020-01-16 12:11:08 +01:00
Jan Schuffenhauer
8051996193 fixed unit test 2020-01-16 12:10:23 +01:00
764aaa927f Added execution rights for .pro files 2020-01-16 12:43:33 +01:00
Mienek
029ac8aa9a Merge branch 'UnitTesting' of https://gitlab.com/creyd/intelliphoto into UnitTesting 2020-01-16 12:36:40 +01:00
Mienek
c3ff1dbc0a kein bock mehr mach dein scheiß richtig das nächste mal 2020-01-16 12:36:19 +01:00
226ab26957 Added Unit Testing Files to gitignore 2020-01-16 12:26:56 +01:00
49b36ab013 Renamed Preparation Script 2020-01-16 12:10:03 +01:00
34294ef7cb Automated Release Preparation 2020-01-16 12:09:30 +01:00
b4a37d8bea Improved Release Prep Script 2020-01-16 12:09:19 +01:00
c7c5567049 Merged release and merge preparation scripts 2020-01-16 12:00:51 +01:00
Jan Schuffenhauer
2353aac54f Merge branch 'dev' into dev-warnings 2020-01-16 11:53:55 +01:00
Jan Schuffenhauer
c83682a09a first warning fixes 2020-01-16 11:50:02 +01:00
876ceb7e39 Updated Colors 2020-01-16 11:39:03 +01:00