|
|
908431f800
|
Merge branch 'develop' of https://etulab.univ-amu.fr/v18003685/pfe-blockchain into develop
|
2023-04-04 14:45:16 +02:00 |
|
|
|
41d3eef376
|
Faute d'ortho + pb glossaire
|
2023-04-04 14:44:57 +02:00 |
|
|
|
9a22c08e22
|
typos et taille image
|
2023-04-04 14:44:15 +02:00 |
|
|
|
713292cf0e
|
Merge branch 'legende_diagrammes_eloise' into 'develop'
Legende diagrammes eloise
See merge request v18003685/pfe-blockchain!40
|
2023-04-04 12:38:15 +00:00 |
|
|
|
f4231aa684
|
Legende diagrammes eloise
|
2023-04-04 12:38:15 +00:00 |
|
|
|
0e9ff27b8b
|
Merge branch '14-glossaire' into 'develop'
Resolve "Glossaire"
Closes #14
See merge request v18003685/pfe-blockchain!39
|
2023-04-04 12:16:54 +00:00 |
|
|
|
1716a717a1
|
Resolve "Glossaire"
|
2023-04-04 12:16:54 +00:00 |
|
|
|
e3bfa2fa0a
|
modif intro + source bitcoin
|
2023-04-04 12:03:12 +02:00 |
|
|
|
740852959f
|
Merge branch 'changement_schéma_plateforme' into 'develop'
Modif schéma achat-vente + suppr image inutile
See merge request v18003685/pfe-blockchain!44
|
2023-04-04 08:31:39 +00:00 |
|
|
|
de36ddab89
|
Merge branch 'introduction_rapport' into 'develop'
Introduction rapport
See merge request v18003685/pfe-blockchain!43
|
2023-04-04 08:25:52 +00:00 |
|
|
|
8c6aa84251
|
Introduction rapport
|
2023-04-04 08:25:52 +00:00 |
|
|
|
c63f70a691
|
Modif schéma achat-vente + suppr image inutile
|
2023-04-04 09:09:41 +02:00 |
|
|
|
6ccc3e54fe
|
Merge branch 'pres_move_attaque' into 'develop'
Partie attaque retravaillée
See merge request v18003685/pfe-blockchain!41
|
2023-04-03 18:10:44 +00:00 |
|
|
|
e2be45856b
|
Merge branch 'abstract' into 'develop'
abstract
See merge request v18003685/pfe-blockchain!35
|
2023-04-03 18:01:18 +00:00 |
|
|
|
b35f3dc534
|
abstract
|
2023-04-03 18:01:18 +00:00 |
|
|
|
bdfae8f498
|
Partie attaque retravaillée
|
2023-04-03 19:23:59 +02:00 |
|
|
|
b7f2047d26
|
Changement de sens images
|
2023-04-03 18:39:55 +02:00 |
|
|
|
4943b745bb
|
Modif partie métier
|
2023-04-03 16:44:05 +02:00 |
|
|
|
050300ef26
|
ajout points et suppresion diapo commandes MIT
|
2023-04-03 16:14:39 +02:00 |
|
|
|
8c9e3baa8c
|
2 autres fautes d'orthographes après relecture
|
2023-04-03 15:51:30 +02:00 |
|
|
|
39aeab2f3f
|
correction orthographe présentation
|
2023-04-03 15:30:34 +02:00 |
|
|
|
5ff150dc95
|
Add pictures intro
|
2023-04-03 12:43:41 +02:00 |
|
|
|
20a829be3e
|
Ajout intro (Eloïse)
|
2023-04-03 12:42:37 +02:00 |
|
|
|
18ec46eae3
|
Merge branch 'présentation_métier' into 'develop'
Présentation métier
See merge request v18003685/pfe-blockchain!31
|
2023-04-03 10:25:57 +00:00 |
|
|
|
c4d371e28f
|
Présentation métier
|
2023-04-03 10:25:57 +00:00 |
|
|
|
dcd2f8c50c
|
oops ^^
|
2023-04-03 12:18:36 +02:00 |
|
|
|
52cfbd8103
|
Intro bougée
|
2023-04-03 12:16:08 +02:00 |
|
|
|
69523761a8
|
Merge branch 'Presentation_finale' into 'develop'
Présentation finale
See merge request v18003685/pfe-blockchain!30
|
2023-04-03 10:10:52 +00:00 |
|
|
|
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 |
|
