|
|
7109948969
|
Merge branch 'dev-colorpalette' into dev
|
2020-01-16 11:19:23 +01:00 |
|
Conrad
|
2e123a71f6
|
Merge branch 'dev-rework' into 'dev'
Started Rework
See merge request creyd/intelliphoto!44
|
2020-01-16 09:59:56 +00:00 |
|
Jan Schuffenhauer
|
c7046f3c06
|
Fixed some bugs, also its mergable now, without any known issues
@DerAnonymos
@AshBastian
|
2020-01-16 00:32:42 +01:00 |
|
Jan Schuffenhauer
|
add66d368b
|
Merge branch 'dev' into dev-colorpalette
|
2020-01-16 00:11:24 +01:00 |
|
Jan Schuffenhauer
|
b695a25128
|
Fixed Inputboxes and Design
Todo pls merge me.
|
2020-01-16 00:00:27 +01:00 |
|
Jan Schuffenhauer
|
5f76f74cd5
|
Fix out of Range
|
2020-01-15 20:35:51 +01:00 |
|
Jonas Mucke
|
0e6ce309c9
|
code cleanup #2
|
2020-01-15 19:04:51 +01:00 |
|
Jonas Mucke
|
72d55b2c8f
|
first Cleanup
|
2020-01-15 18:40:17 +01:00 |
|
Jonas Mucke
|
2b433101c7
|
kein debug wird benötigt
|
2020-01-15 18:19:02 +01:00 |
|
AshBastian
|
b5e05a9c6a
|
Update InputBoxes
|
2020-01-15 15:48:38 +01:00 |
|
|
|
4d6c0da250
|
Automated Merge Preparation
|
2020-01-15 15:23:16 +01:00 |
|
|
|
76dfe45837
|
Update uncrustify.cfg
|
2020-01-15 15:23:11 +01:00 |
|
|
|
9e81d953af
|
Automated Merge Preparation
|
2020-01-15 15:22:08 +01:00 |
|
|
|
aae3e5f89f
|
Update uncrustify.cfg
|
2020-01-15 15:22:01 +01:00 |
|
|
|
691f3df28d
|
Automated Merge Preparation
|
2020-01-15 15:19:22 +01:00 |
|
|
|
979dfc220a
|
Fixed Git Integration
|
2020-01-15 15:14:25 +01:00 |
|
|
|
4353b7764d
|
Added Git Integration for Preparation Scripts
|
2020-01-15 15:12:35 +01:00 |
|
|
|
63b6d12422
|
Fixed bug in prep scripts
|
2020-01-15 15:09:40 +01:00 |
|
|
|
808d4d17c6
|
Added configuration check to preparation scripts
|
2020-01-15 15:06:24 +01:00 |
|
|
|
234cd4e420
|
Update cppcheck_errors.txt
|
2020-01-15 15:03:34 +01:00 |
|
|
|
d7e44890af
|
Removed // comments from another header file
|
2020-01-15 15:02:35 +01:00 |
|
Conrad
|
14233f8484
|
Merge branch 'dev' into 'dev-rework'
# Conflicts:
# cppcheck_errors.txt
# src/GUI/IntelliPhotoGui.h
|
2020-01-15 13:57:27 +00:00 |
|
Conrad
|
65b6de44e6
|
Merge branch 'dev-setPolygon' into 'dev'
Dev set polygon
See merge request creyd/intelliphoto!41
|
2020-01-15 13:53:34 +00:00 |
|
|
|
dcbf163c7f
|
Added execution rights for merge prep script
|
2020-01-15 14:52:06 +01:00 |
|
|
|
cf3c542250
|
Uncrustified Commits and Updated Errors
|
2020-01-15 14:48:50 +01:00 |
|
|
|
455b9281eb
|
Renamed release.sh and added Merge Prep Script
|
2020-01-15 14:44:30 +01:00 |
|
|
|
efa43cfbbf
|
Update release.sh
|
2020-01-15 14:37:54 +01:00 |
|
|
|
c3c4debd95
|
Update release.sh
|
2020-01-15 14:35:13 +01:00 |
|
|
|
702f667295
|
Update release.sh
|
2020-01-15 14:32:37 +01:00 |
|
Jan Schuffenhauer
|
1f0b856079
|
FIxed all bugs and removed dead code
my job is done here
ready to be merge
|
2020-01-15 14:23:14 +01:00 |
|
|
|
5ef800fdd5
|
Update release.sh
|
2020-01-15 14:16:59 +01:00 |
|
|
|
b198d0303c
|
Added executing rights for release script
|
2020-01-15 14:09:44 +01:00 |
|
|
|
4ca64ff860
|
Update release.sh
|
2020-01-15 14:08:19 +01:00 |
|
|
|
5773f62fed
|
Added Doxyfile
|
2020-01-15 14:04:52 +01:00 |
|
Jan Schuffenhauer
|
f575da20d7
|
Updated it works kinda
TOdo: fix BUGS
|
2020-01-15 12:35:29 +01:00 |
|
|
|
8b8b6965c3
|
Added Release Script Draft
|
2020-01-15 12:33:00 +01:00 |
|
|
|
94dc372046
|
Update cppcheck_errors.txt
|
2020-01-15 12:17:03 +01:00 |
|
|
|
70ed416dc6
|
Uncrustified Files
|
2020-01-15 12:02:36 +01:00 |
|
|
|
af5a05faf8
|
Removed Linestyle from the project
|
2020-01-15 12:01:17 +01:00 |
|
|
|
c4467b70b8
|
Removed Rest of the // comments in headers
|
2020-01-15 11:47:51 +01:00 |
|
|
|
9d1159a08e
|
Removed First Part of the // comments in headers
- TODO: IntelliPhotoGui
|
2020-01-15 11:45:57 +01:00 |
|
Jan Schuffenhauer
|
2a1561ecfb
|
updated functionality and set true to test.
Todo: Cleanub and make it activalable
|
2020-01-15 11:14:01 +01:00 |
|
Jan Schuffenhauer
|
d8f6f0f8f7
|
implemented creation of certain image type and alo button for setting poylgon data
TODO implement setPolygon function
|
2020-01-14 21:02:03 +01:00 |
|
|
|
6fec7c26bf
|
Uncrustified Files
|
2020-01-13 19:59:30 +01:00 |
|
|
|
cc56f61247
|
Uncrustifyed Status
|
2020-01-13 19:37:22 +01:00 |
|
AshBastian
|
7491472962
|
Schluss
|
2020-01-10 21:10:49 +01:00 |
|
AshBastian
|
dbf1cda101
|
Update
|
2020-01-10 14:15:59 +01:00 |
|
Bastian Schindler
|
b978a94bd3
|
Merge branch 'Merge' into 'dev-colorpalette'
Merge
See merge request creyd/intelliphoto!40
|
2020-01-10 11:41:08 +00:00 |
|
AshBastian
|
ea7316cb0b
|
Buttonsize Updated
|
2020-01-10 12:39:01 +01:00 |
|
AshBastian
|
74d2d30fe0
|
Update
|
2020-01-10 12:28:55 +01:00 |
|
