Commit Graph

757 Commits

Author SHA1 Message Date
Bertrand BRUN
940cd7d42c Ajout de la dernier version du rapport et de la presentation 2011-05-31 17:36:32 +02:00
Bertrand BRUN
a6541dec79 Ajout de la dernier version de l'appli 2011-05-31 17:25:47 +02:00
Bertrand Brun
23545df3a5 Modification du fichier README.markdown 2011-05-31 17:08:15 +02:00
John Charron
7bd813e57b VERSION FINALE - Youppie !!!!!! (jc) 2011-05-31 16:31:12 +02:00
John Charron
8ca2303601 Modifs presque fini avant version finale (jc gd et bb) 2011-05-31 15:17:09 +02:00
John Charron
cbbd85de0d modifs de relecture finale, mais au début du rapport seulement jusqu'à la partie archive de la bd (jc) 2011-05-31 13:32:15 +02:00
John Charron
6ee3be9ffb Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable
Conflicts:
	rapport/rapport.tex
2011-05-31 12:35:37 +02:00
John Charron
9ae50f23aa Récupération d'erreurs cce683e (jc) 2011-05-31 12:32:12 +02:00
Georges Dupéron
1d9e4e4342 Merge branch 'unstable' of github:jsmaniac/2011-m1s2-ter into unstable 2011-05-31 11:46:01 +02:00
Georges Dupéron
e23a44ebcb Corrections en cours. 2011-05-31 11:45:49 +02:00
John Charron
058f61a0e0 bibliographie quasi fini (jc) 2011-05-31 11:44:39 +02:00
Georges Dupéron
d435764341 Corrections sur Analyse de l'existant que j'avais oublié de commit. 2011-05-31 11:32:32 +02:00
John Charron
0ac3aa60a2 Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable 2011-05-31 11:22:27 +02:00
John Charron
4af61fd2dd modifs minims (jc) 2011-05-31 11:22:13 +02:00
Georges Dupéron
acd6bb5522 Merge branch 'unstable' of github:jsmaniac/2011-m1s2-ter into unstable 2011-05-31 11:21:25 +02:00
John Charron
46ccb05b9a modifs bibliographie entamées (jc) 2011-05-31 11:18:21 +02:00
Georges Dupéron
a804039b9c Merge branch 'unstable' of github:jsmaniac/2011-m1s2-ter into unstable 2011-05-31 11:16:07 +02:00
Georges Dupéron
be4d0cf81b Georges: Correction partie 3 Analyse des besoins. 2011-05-31 11:15:36 +02:00
Georges Dupéron
e8a68d9f43 Georges: Corrections partie 2 Analyse de l'existant. 2011-05-31 11:08:32 +02:00
John Charron
76c4947a41 ajout d'images capture écran version html au document rapport.tex (jc) 2011-05-31 11:08:06 +02:00
Georges Dupéron
30966c6567 Erreur lors du merge précédent 2011-05-31 10:54:01 +02:00
John Charron
1e2cbb1e09 Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable
Conflicts:
	rapport/rapport.tex
2011-05-31 10:48:50 +02:00
John Charron
cce683e487 Déplacement partie Georges Algos nuage (jc) 2011-05-31 10:37:10 +02:00
John Charron
74d36adc9e Ajout d'images capture écran version html5 (jc) 2011-05-31 10:36:31 +02:00
John Charron
3d759e0780 nouveau dossier img (jc) 2011-05-31 10:23:45 +02:00
Georges Dupéron
5afcef8c86 Georges: Corrections Introduction + Meta-% 2011-05-31 10:23:36 +02:00
John Charron
76dd799878 modif dossier image (jc) 2011-05-31 10:21:28 +02:00
Georges Dupéron
367998cf08 Georges: Corrections Page de garde (aucune correction) et Abstract. 2011-05-31 10:15:28 +02:00
John Charron
4c77001415 Control + H plus quelques modifs (jc) 2011-05-31 09:24:09 +02:00
John Charron
15fee07715 Correction Lucie, parties 0 à 4 (jc) 2011-05-31 09:17:35 +02:00
John Charron
cff2ed5d5d Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable
Conflicts:
	rapport/rapport.tex
2011-05-31 00:31:04 +02:00
John Charron
0248ffba9a Conception et Réalisation, jusqu'à "BOoKMARK" (jc) 2011-05-31 00:21:53 +02:00
Georges Dupéron
9393fcf396 Correction typographique. 2011-05-30 23:57:12 +02:00
Georges Dupéron
4e03bf8655 Merge branch 'unstable' of github:jsmaniac/2011-m1s2-ter into unstable 2011-05-30 23:55:41 +02:00
Georges Dupéron
8ec9079369 Ajout de la partie «algos». 2011-05-30 23:53:39 +02:00
John Charron
b41d645ccd Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable 2011-05-30 23:09:45 +02:00
John Charron
b3aba423a7 Modifs de l'ordre des parties (conception et réalisation surtout) (jc) 2011-05-30 23:08:19 +02:00
Bertrand BRUN
080c078a86 Ajout des images manquant de l'application 2011-05-30 22:56:59 +02:00
John Charron
066a83e1fe Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable
Conflicts:
	rapport/rapport.tex
2011-05-30 22:23:53 +02:00
John Charron
433beb39a4 push suite à pbm merge Bertrand (jc) 2011-05-30 22:14:20 +02:00
Bertrand BRUN
5e9b5fdf1f Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable
Conflicts:
	rapport/rapport.tex
2011-05-30 22:12:54 +02:00
Bertrand BRUN
1875c3209e Petit modification au niveau des schema de John 2011-05-30 22:08:17 +02:00
John Charron
e8833f3c69 Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable 2011-05-30 21:53:42 +02:00
John Charron
cb2f1d860d Suite relecture partie site (jc) 2011-05-30 21:53:11 +02:00
Bertrand BRUN
381fc68edd Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable 2011-05-30 21:52:37 +02:00
Bertrand BRUN
60f7f29089 Changement de l'image de creation de partie 2011-05-30 21:52:15 +02:00
John Charron
319690ce39 Petits modifs pour qu'on puisse compiler (jc) 2011-05-30 21:40:46 +02:00
John Charron
d1e40ad28a Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable 2011-05-30 21:37:42 +02:00
John Charron
785f0fbf8c Quelques modifs partie site (jc) 2011-05-30 21:37:18 +02:00
Bertrand BRUN
076cd8926e Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable 2011-05-30 21:34:38 +02:00