Commit Graph

127 Commits

Author SHA1 Message Date
3a7a65cb75 Présentation finale 2023-04-03 10:10:51 +00:00
6faa176e69 Merge branch 'presentation_Amaury' into 'develop'
Présentation Relay + Sidechains

See merge request v18003685/pfe-blockchain!36
2023-04-03 09:59:31 +00:00
a8aa2f9482 Présentation Relay + Sidechains 2023-04-03 09:59:30 +00:00
63f7602985 Ajout glossaire partie centralisée 2023-04-03 11:46:03 +02:00
365cbf4323 Merge branch 'louis_presentation_rapport_wormhole' into 'develop'
ajout rapport wormhole + modification présentation wormhole

See merge request v18003685/pfe-blockchain!23
2023-04-02 19:27:39 +00:00
cfe19b56e2 ajout rapport wormhole + modification présentation wormhole 2023-04-02 19:27:39 +00:00
6d9956e401 Merge branch 'Intro' into 'develop'
Intro / Conclusion / Glossaire

See merge request v18003685/pfe-blockchain!27
2023-04-02 19:03:31 +00:00
8aacb5aa1b Intro / Conclusion / Glossaire 2023-04-02 19:03:31 +00:00
d242e443a8 Merge branch 'ajout_biblio_pools_liquidtés' into 'develop'
Ajout biblio pools liquidtés

See merge request v18003685/pfe-blockchain!32
2023-04-02 17:09:25 +00:00
2dc75cd204 Ajout biblio pools liquidtés 2023-04-02 17:09:24 +00:00
343916d70f Merge branch 'presentation_bridges' into 'develop'
Presentation bridges

See merge request v18003685/pfe-blockchain!34
2023-04-02 16:43:39 +00:00
9a15536742 Presentation bridges 2023-04-02 16:43:39 +00:00
7b180e6955 Supression vieilles images 2023-04-02 14:46:22 +02:00
8ccfbaa8a3 Changement digramme 2023-04-02 14:45:52 +02:00
4554d0fdce Merge branch 'Correction' into 'develop'
Ajout newpage + corrections

See merge request v18003685/pfe-blockchain!33
2023-04-02 11:07:08 +00:00
aea409ca39 Merge branch 'rapport_bridges' into 'develop'
Rapport Bridge (Eloise)

See merge request v18003685/pfe-blockchain!25
2023-04-02 10:10:43 +00:00
c4b51d8422 Rapport Bridge (Eloise) 2023-04-02 10:10:43 +00:00
23cb2fee6f Resolution conflit sources 2023-04-02 11:23:12 +02:00
31c5f6c306 Ajout newpage + corrections 2023-04-02 09:56:03 +02:00
53c529bd5f Merge branch 'attaques_Rom1' into 'develop'
Nouvelle branche rapport + expe attaques

See merge request v18003685/pfe-blockchain!18
2023-04-01 23:21:13 +00:00
7069ed925f Nouvelle branche rapport + expe attaques 2023-04-01 23:21:13 +00:00
22ad755964 Merge branch 'pool_de_liquidité' into 'develop'
Des petits refactors

See merge request v18003685/pfe-blockchain!29
2023-04-01 10:30:58 +00:00
2a3cf80317 Des petits refactors 2023-04-01 10:30:58 +00:00
b40f79030d ajout sources et bibliographie 2023-03-31 14:36:40 +02:00
1b955abee9 Merge branch 'pool_de_liquidité' into 'develop'
ajout de la partie sur les pools de liquidité

See merge request v18003685/pfe-blockchain!19
2023-03-31 11:30:30 +00:00
dfc34298ab ajout de la partie sur les pools de liquidité 2023-03-31 11:30:30 +00:00
a4fcbf3ef6 Merge branch 'Rapport_Dorian' into 'develop'
Rapport dorian

See merge request v18003685/pfe-blockchain!17
2023-03-31 10:56:27 +00:00
b9cc72e5fd Rapport dorian 2023-03-31 10:56:27 +00:00
2e69b2732c Merge branch 'ajout_biblio' into 'develop'
Ajout de la bibliographie

See merge request v18003685/pfe-blockchain!26
2023-03-30 20:18:44 +00:00
0e5f189bda Ajout de la bibliographie 2023-03-30 20:18:44 +00:00
525c6c7cd7 Merge branch 'reunion24_04_23' into 'develop'
Reunion24 04 23

See merge request v18003685/pfe-blockchain!21
2023-03-30 13:54:08 +00:00
d5ad0d1c69 Reunion24 04 23 2023-03-30 13:54:08 +00:00
306685c87e Petite correction 2 2023-03-28 08:35:13 +00:00
9537914705 Merge branch 'Correction-main-rapport' into 'develop'
Correction main rapport

See merge request v18003685/pfe-blockchain!22
2023-03-28 07:51:15 +00:00
faffa232f6 Correction main rapport 2023-03-28 07:51:15 +00:00
8d048c3f62 modification sur la forme de la partie wormhole de la présentation 2023-03-23 20:22:50 +01:00
57f5e1e8b3 Ajout squelette partie Dorian 2023-03-21 12:48:38 +01:00
944a914d2a Merge branch 'correct_branch' into 'develop'
Petites corrections

See merge request v18003685/pfe-blockchain!16
2023-03-17 08:03:46 +00:00
01794a784f Petites corrections 2023-03-17 08:02:52 +00:00
4bfaf899b5 Merge branch 'fix_table_des_matières' into 'develop'
fix table des matières

See merge request v18003685/pfe-blockchain!15
2023-03-17 07:57:02 +00:00
c317c45ade fix table des matières 2023-03-17 07:57:02 +00:00
7819bfd133 Merge branch 'suppression_frames_inutile' into 'develop'
Update docs/presentation_17_03_23/decentralisation/relay.tex,...

See merge request v18003685/pfe-blockchain!14
2023-03-16 21:14:21 +00:00
234836900e Update docs/presentation_17_03_23/decentralisation/relay.tex,... 2023-03-16 21:14:21 +00:00
1fccadc530 Merge branch 'presentation_cenralisé' into 'develop'
Presentation cenralisé

See merge request v18003685/pfe-blockchain!13
2023-03-16 20:32:55 +00:00
0806ca4bef Presentation cenralisé 2023-03-16 20:32:55 +00:00
7c9849d702 Merge branch 'presentation_decentralisé' into 'develop'
squelette presentation decentralisé

See merge request v18003685/pfe-blockchain!12
2023-03-16 20:32:33 +00:00
e14bf6f452 squelette presentation decentralisé 2023-03-16 20:32:33 +00:00
d83bedc02c Merge branch 'ajout_beamer_presentation' into 'develop'
split des docs en 1 beamer et 1 rapport

See merge request v18003685/pfe-blockchain!11
2023-03-15 09:14:52 +00:00
4e6bd250b3 split des docs en 1 beamer et 1 rapport 2023-03-15 10:05:33 +01:00
2c880c3536 ajout note Dorian 2023-03-14 12:47:24 +00:00