 T'JAMPENS QUENTIN p2406187
|
49c09b8d2e
|
Merge branch 'feature/addStep' into 'dev'
Add step btn
See merge request p2406187/sae201!29
|
2025-06-21 11:18:09 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
8a781a2df6
|
Merge branch 'dev' into 'feature/addStep'
# Conflicts:
# mainwindow.cpp
|
2025-06-21 11:18:03 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
6a4d58660e
|
Merge branch 'feature/linkExportBtn' into 'dev'
Feature/link export btn
See merge request p2406187/sae201!23
|
2025-06-20 16:35:52 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
5df8be4fba
|
Merge branch 'dev' into 'main'
Dev
See merge request p2406187/sae201!20
|
2025-06-20 14:52:22 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
af4426191f
|
Merge branch 'main' into 'dev'
# Conflicts:
# mainwindow.cpp
|
2025-06-20 14:52:18 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
d14bd80a23
|
Merge branch 'feature/web' into 'dev'
Feature/web
See merge request p2406187/sae201!18
|
2025-06-20 14:40:08 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
d3b84f32f4
|
Merge branch 'dev' into 'feature/web'
# Conflicts:
# data/parcours2.json
# mainwindow.cpp
# mainwindow.h
# step.cpp
# step.h
|
2025-06-20 14:40:02 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
1a0b373e8e
|
Merge branch 'feature/validateBtn' into 'main'
Feature/validate btn
See merge request p2406187/sae201!17
|
2025-06-20 14:25:05 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
3e9e248f04
|
Merge branch 'main' into 'feature/validateBtn'
# Conflicts:
# mainwindow.h
# mainwindow.ui
# path.cpp
|
2025-06-20 14:24:44 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
aa61cc14b9
|
Merge branch 'feature/changeStep' into 'main'
Can change step
See merge request p2406187/sae201!13
|
2025-06-20 09:55:07 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
d19946a779
|
Merge branch 'feature/changePath' into 'main'
Feature/change path
See merge request p2406187/sae201!12
|
2025-06-20 09:31:28 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
9f8bc30d5a
|
Merge branch 'feature/stepInformation' into 'main'
Feature/step information
See merge request p2406187/sae201!11
|
2025-06-20 09:03:46 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
f8cac1aeff
|
Merge branch 'feature/editTool' into 'main'
Feature/edit tool
See merge request p2406187/sae201!10
|
2025-06-19 20:56:32 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
84217adccf
|
Merge branch 'feature/undoredo' into 'main'
Feature/undoredo
See merge request p2406187/sae201!9
|
2025-06-19 17:30:38 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
ebdd205d8c
|
Delete .qmake.stash
|
2025-06-19 08:42:49 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
29054c76a2
|
Merge branch 'feature/openFile' into 'main'
Feature/open file
See merge request p2406187/sae201!8
|
2025-06-19 08:26:57 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
6b4191057f
|
Merge branch 'main' into 'feature/openFile'
# Conflicts:
# path.h
|
2025-06-19 08:26:49 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
938a7798b6
|
Merge branch 'feature/Terraventura' into 'main'
Feature/terraventura
See merge request p2406187/sae201!4
|
2025-06-19 07:38:07 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
d9ccb54768
|
Merge branch 'main' into 'feature/Terraventura'
# Conflicts:
# sae201.pro
|
2025-06-19 07:37:58 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
3048920666
|
Add image
|
2025-06-18 17:08:29 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
fa52281d2b
|
Add path information
|
2025-06-18 16:49:40 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
269f96a56b
|
Add path class
|
2025-06-18 15:26:37 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
148e774c83
|
Merge branch 'feature/Path' into 'main'
initialise path.h
See merge request p2406187/sae201!1
|
2025-06-18 12:36:50 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
6d45acc357
|
Initialize mainWindows class
|
2025-06-18 14:34:57 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
cb03e1f91f
|
Initial commit
|
2025-06-18 14:19:11 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
bde01ae1b2
|
Initial commit
|
2025-06-18 14:17:48 +02:00 |
|