|
|
6d857c5cd5
|
Merge branch 'dev' into 'fix/localistation'
# Conflicts:
# mainwindow.cpp
|
2025-06-21 12:13:52 +00:00 |
|
JOSSERAND GIOVANNI p2405212
|
2bf6a9397e
|
Merge branch 'feature/resetplainTextEdit' into 'dev'
fix duplication of dialogues
See merge request p2406187/sae201!33
|
2025-06-21 12:13:07 +00:00 |
|
Pyramond
|
c8e264fe18
|
Save loc on validation and stop validation when stepNumber value is changed
|
2025-06-21 14:13:01 +02:00 |
|
Giovanni JOSSERAND
|
6b24485cf0
|
fix duplication of dialogues
|
2025-06-21 14:12:31 +02:00 |
|
Pyramond
|
f15583020d
|
Remove useless files
|
2025-06-21 13:47:54 +02:00 |
|
|
|
83e7a92ee3
|
Merge branch 'feature/undoRedoPlainTextEdit' into 'dev'
Add undo/redo action for dialogEdit
See merge request p2406187/sae201!32
|
2025-06-21 11:45:15 +00:00 |
|
Pyramond
|
3fa9853a12
|
Add undo/redo action for dialogEdit
|
2025-06-21 13:43:59 +02:00 |
|
p2405951
|
b4f153888c
|
Merge branch 'dev' of https://iutbg-gitlab.iutbourg.univ-lyon1.fr/p2406187/sae201 into dev
|
2025-06-21 13:24:23 +02:00 |
|
p2405951
|
f35ac93673
|
bouton retour html
|
2025-06-21 13:23:17 +02:00 |
|
JOSSERAND GIOVANNI p2405212
|
4ab0b1a6f4
|
Merge branch 'feature/automatiqueValidate' into 'dev'
add of automatique validate
See merge request p2406187/sae201!31
|
2025-06-21 11:22:11 +00:00 |
|
JOSSERAND GIOVANNI p2405212
|
93a04e9185
|
Merge branch 'dev' into 'feature/automatiqueValidate'
# Conflicts:
# mainwindow.cpp
# mainwindow.h
|
2025-06-21 11:22:01 +00:00 |
|
Giovanni JOSSERAND
|
b2457787b7
|
add of automatique validate
|
2025-06-21 13:19:40 +02:00 |
|
|
|
49c09b8d2e
|
Merge branch 'feature/addStep' into 'dev'
Add step btn
See merge request p2406187/sae201!29
|
2025-06-21 11:18:09 +00:00 |
|
|
|
8a781a2df6
|
Merge branch 'dev' into 'feature/addStep'
# Conflicts:
# mainwindow.cpp
|
2025-06-21 11:18:03 +00:00 |
|
Pyramond
|
ffcb6fa203
|
Add step btn
|
2025-06-21 13:14:54 +02:00 |
|
JOSSERAND GIOVANNI p2405212
|
1a53e15095
|
Merge branch 'fix/valideBtn' into 'dev'
fix of validate crash and validate dialogues and personnages
See merge request p2406187/sae201!28
|
2025-06-21 10:45:59 +00:00 |
|
Giovanni JOSSERAND
|
6950ff066c
|
Merge remote-tracking branch 'origin/dev' into fix/valideBtn
|
2025-06-21 12:43:40 +02:00 |
|
Giovanni JOSSERAND
|
04fcf40798
|
fix of validate crash and validate dialogues and personnages
|
2025-06-21 12:28:21 +02:00 |
|
p2405951
|
699643741c
|
fix issue link html
|
2025-06-21 11:27:52 +02:00 |
|
Pyramond
|
2f1b9b2097
|
Remove unseless file
|
2025-06-21 01:45:51 +02:00 |
|
Pyramond
|
7c9601f60c
|
Add default image
|
2025-06-21 01:44:57 +02:00 |
|
Giovanni JOSSERAND
|
d1a32217d2
|
re-add of styleTool widgets
|
2025-06-21 00:16:58 +02:00 |
|
JOSSERAND GIOVANNI p2405212
|
55dcacaa96
|
Merge branch 'feature/styleTool' into 'dev'
Feature/style tool
See merge request p2406187/sae201!27
|
2025-06-20 21:57:40 +00:00 |
|
JOSSERAND GIOVANNI p2405212
|
e85e3f9c07
|
Merge branch 'dev' into 'feature/styleTool'
# Conflicts:
# mainwindow.cpp
# mainwindow.h
# mainwindow.ui
|
2025-06-20 21:57:30 +00:00 |
|
Giovanni JOSSERAND
|
a74c419c5d
|
add of shortcut for style tools
|
2025-06-20 23:38:12 +02:00 |
|
Giovanni JOSSERAND
|
a609d4f413
|
update style functions to work without selection
|
2025-06-20 23:26:30 +02:00 |
|
Giovanni JOSSERAND
|
2f6b7d44d8
|
add of fontSize and font functions
|
2025-06-20 23:10:11 +02:00 |
|
Giovanni JOSSERAND
|
0b4f2a172c
|
add of overline function
|
2025-06-20 22:40:18 +02:00 |
|
Giovanni JOSSERAND
|
b9aa141763
|
adapt style function to work with PlainTextEdit
|
2025-06-20 22:18:33 +02:00 |
|
JOSSERAND GIOVANNI p2405212
|
2ad71467d8
|
Merge branch 'feature/menuBar' into 'dev'
Feature/menu bar
See merge request p2406187/sae201!25
|
2025-06-20 19:57:56 +00:00 |
|
Giovanni JOSSERAND
|
516d432bdd
|
add copy, past and cut for plainTextedit
|
2025-06-20 21:56:15 +02:00 |
|
Giovanni JOSSERAND
|
75f9928957
|
review of toolbar and menu bar
|
2025-06-20 21:21:46 +02:00 |
|
|
|
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
|
1690eadfae
|
Start index at 0
|
2025-06-20 18:33:49 +02:00 |
|
T'JAMPENS QUENTIN p2406187
|
8c33d16122
|
Add export to html btn
|
2025-06-20 18:33:34 +02:00 |
|
T'JAMPENS QUENTIN p2406187
|
3882a017d9
|
Remove files
|
2025-06-20 18:19:21 +02:00 |
|
T'JAMPENS QUENTIN p2406187
|
90b74efe01
|
Add html and json file
|
2025-06-20 18:17:16 +02:00 |
|
T'JAMPENS QUENTIN p2406187
|
0e5b7e3743
|
Fix path loading
|
2025-06-20 18:15:26 +02:00 |
|
JOSSERAND GIOVANNI p2405212
|
2b07de57d0
|
Merge branch 'feature/saveAs' into 'main'
add of saveAsFile function
See merge request p2406187/sae201!22
|
2025-06-20 15:00:13 +00:00 |
|
Giovanni JOSSERAND
|
69e206afa9
|
add of saveAsFile function
|
2025-06-20 16:58:59 +02:00 |
|
|
|
5df8be4fba
|
Merge branch 'dev' into 'main'
Dev
See merge request p2406187/sae201!20
|
2025-06-20 14:52:22 +00:00 |
|
|
|
af4426191f
|
Merge branch 'main' into 'dev'
# Conflicts:
# mainwindow.cpp
|
2025-06-20 14:52:18 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
1011a9f123
|
Fix issues
|
2025-06-20 16:51:11 +02:00 |
|
JOSSERAND GIOVANNI p2405212
|
a2c4577025
|
Merge branch 'fix/valider' into 'main'
fix of valider button
See merge request p2406187/sae201!19
|
2025-06-20 14:48:42 +00:00 |
|
Giovanni JOSSERAND
|
be6c35faa8
|
fix of valider button
|
2025-06-20 16:47:19 +02:00 |
|
|
|
d14bd80a23
|
Merge branch 'feature/web' into 'dev'
Feature/web
See merge request p2406187/sae201!18
|
2025-06-20 14:40:08 +00:00 |
|
|
|
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 |
|
Giovanni JOSSERAND
|
fe5623b804
|
add of color selector
|
2025-06-20 16:30:24 +02:00 |
|
T'JAMPENS QUENTIN p2406187
|
c6be9f6c17
|
Fix issues
|
2025-06-20 16:30:18 +02:00 |
|
|
|
1a0b373e8e
|
Merge branch 'feature/validateBtn' into 'main'
Feature/validate btn
See merge request p2406187/sae201!17
|
2025-06-20 14:25:05 +00:00 |
|
