Commit Graph

189 Commits

Author SHA1 Message Date
sidya82 fddfc69616 lol sa va beugué 2015-03-16 15:35:03 +01:00
www b69f8c03b6 modified: SRC/config/mail.php 2015-03-16 14:20:24 +01:00
alexandre-pereira f9251c68f9 Co co mit 2015-03-16 14:07:32 +01:00
alexandre-pereira 4ef3e7e8b3 Intégration images dans Mémory 2015-03-15 19:38:11 +01:00
alexandre-pereira 0cfce7d1f9 Presque terminé 2015-03-15 02:23:26 +01:00
alexandre-pereira 6ea2de6e26 Ajout <select multiple> dropdown 2015-03-14 18:20:35 +01:00
alexandre-pereira 4135ae7317 Il est tout comme Mite' ! 2015-03-14 17:48:57 +01:00
alexandre-pereira de05756a7b Refactoring Complet
Voir facebook pour l'installation de la nouvelle BDD.
2015-03-14 14:36:03 +01:00
alexandre-pereira e87cf67a71 Merge remote-tracking branch 'origin/master'
Conflicts:
	SRC/resources/views/home.blade.php
2015-03-10 16:00:02 +01:00
alexandre-pereira df57f8f539 new main page 2015-03-10 15:57:41 +01:00
DonRenando 12a0a618a6 retour ligne et centre memory 2015-03-10 15:50:25 +01:00
DonRenando f0fcd0da22 retour ligne et centre memory 2015-03-10 15:09:33 +01:00
DonRenando 1bc1f7f3e3 modif css memory 2015-03-10 14:38:52 +01:00
DonRenando 853ee062d9 modif button et css memory2 2015-03-09 22:22:43 +01:00
DonRenando 3ea7f8ae6e modif button et css memory 2015-03-09 21:35:52 +01:00
Malibu c9c0e2e592 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-09 18:36:38 +01:00
Malibu 26a0828f26 modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-03-09 18:36:03 +01:00
DonRenando e0d6100592 css js et responsive memory 2015-03-09 18:10:03 +01:00
Jerome Morjon 544a9d5473 maj css home + new js 2015-03-09 15:13:03 +01:00
DonRenando 6ffe9e1f78 responsive css js memory 2 2015-03-08 16:02:07 +01:00
DonRenando b62e47b1a1 responsive css js memory 2015-03-07 23:59:57 +01:00
DonRenando f237daf600 MAJ css js memory 2015-03-07 17:38:06 +01:00
DonRenando 3cc136c184 css suite memory 3 2015-03-07 01:41:43 +01:00
DonRenando 957973fd28 css suite memory button 2015-03-07 01:38:42 +01:00
DonRenando c6ae337eca css suite memory 2015-03-07 01:25:55 +01:00
Jerome Morjon d319cb7ba2 Correction des alt img sur home + correction page ref
fichier ref idem sur serveur
2015-03-06 22:10:54 +01:00
Jerome Morjon a895bb66ee maj css et icon 2015-03-06 10:51:13 +01:00
Jerome Morjon 9d66bf0b91 correction bouton add referent dans admin 2015-03-05 21:17:56 +01:00
Jerome Morjon 67279e8265 fixation du bug affichage bouton retour sur Login 2015-03-05 21:12:34 +01:00
Jerome Morjon d696bdb4b7 re correction 2015-03-05 20:42:23 +01:00
Jerome Morjon bb752a2e98 correction des bugs css sur home + ajout img game
Correction du bug de la page home de:
-icon loupe
-champs recherche
-fond d’image ref
-correction position indicateur
-correction fond du nom du prof
2015-03-05 20:30:22 +01:00
www f7b99d84c9 alaa 2015-03-05 19:27:08 +01:00
Malibu 3613ef325f modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-03-05 19:17:18 +01:00
DonRenando 279ffdcae1 mise en place jeu memory mais pas fini 2015-03-05 18:03:46 +01:00
Malibu 91089b72f7 modified: SRC/public/js/ListeOeuvre.js 2015-03-05 11:32:08 +01:00
Malibu 84dcddb48d modified: SRC/public/js/ListeOeuvre.js 2015-03-04 22:43:27 +01:00
Malibu 652d5dba9a modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-03-04 22:24:42 +01:00
Malibu 880652df04 modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-03-04 19:36:23 +01:00
sidya82 85440932a6 modified: SRC/public/js/ListeOeuvre.js 2015-03-03 18:02:56 +01:00
sidya82 e685a8e104 modified: SRC/public/js/ListeOeuvre.js 2015-03-03 18:00:22 +01:00
sidya82 e38f7d5737 modified: SRC/public/js/ListeOeuvre.js
modified:   SRC/resources/views/referent.blade.php
2015-03-03 17:47:08 +01:00
Malibu fe111c9661 blabla 2015-03-03 15:35:21 +01:00
sidya82 caed3d7972 modifié : SRC/public/js/ListeOeuvre.js 2015-03-03 12:24:43 +01:00
DonRenando 3a980e247b ajax 2015-03-03 12:05:09 +01:00
sidya82 61f4439942 modifié : SRC/public/js/ListeOeuvre.js 2015-03-03 11:48:16 +01:00
sidya82 31b5e76cbe modifié : SRC/public/js/ListeOeuvre.js 2015-03-02 11:55:04 +01:00
Jerome Morjon 233303e7b2 remis 2015-03-02 11:19:22 +01:00
Malibu 29e8b82b3f modified: SRC/public/js/ListeOeuvre.js 2015-02-27 15:31:11 +01:00
Malibu 386ba3fac0 modified: SRC/public/css/referent.css
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-02-27 15:28:42 +01:00
sidya82 24a1fcad27 modifié : SRC/public/js/ListeOeuvre.js
modifié :         SRC/resources/views/referent.blade.php
2015-02-27 15:01:24 +01:00
Malibu 9edc7af7d3 modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-02-26 15:07:34 +01:00
Malibu 439888f0db modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-02-26 12:04:25 +01:00
Malibu ecf963857b modified: SRC/public/js/ListeOeuvre.js 2015-02-24 12:19:17 +01:00
www 52cae36ce6 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-24 11:36:54 +01:00
www 2fbbc8fe77 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
Conflicts:
	SRC/app/Http/Controllers/ReferentController.php
	SRC/public/css/game.css
	SRC/public/css/home.css
	SRC/resources/views/referent.blade.php
	SRC/resources/views/referent_games.blade.php
2015-02-24 11:35:26 +01:00
Malibu c2bef25f88 modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
2015-02-24 11:35:26 +01:00
www 4f8e9f9a38 bug 2015-02-24 11:34:35 +01:00
Malibu 407a955444 modified: SRC/app/Http/routes.php
modified:   SRC/public/js/ListeOeuvre.js
2015-02-23 19:40:01 +01:00
Malibu 8a0f8a5b3c modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-02-23 19:35:01 +01:00
Malibu 695adc5d3a modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-02-23 14:18:18 +01:00
Jerome Morjon 2399b7eace maj taille police 2015-02-21 16:59:22 +01:00
Jerome Morjon 7d07bfbdca maj css home et game_ref 2015-02-21 16:54:08 +01:00
Jerome Morjon b31430469e ajout d'une icon game et suppression du texte game 2015-02-21 16:41:08 +01:00
Jerome Morjon 3a26e58fb4 suppression du coverflow 2015-02-21 16:35:30 +01:00
Jerome Morjon 2a4fef10d7 test du coverflow page d'acceuil 2015-02-21 03:53:55 +01:00
Jerome Morjon 36a4d192e1 refonte du tableau de la page admin 2015-02-21 00:23:31 +01:00
Jerome Morjon 2cb24c6e1d maj du div gauche
alignement du tableau
2015-02-20 23:33:10 +01:00
Jerome Morjon 291a5c2937 remise en place des css + creation des css 2015-02-20 22:29:41 +01:00
Malibu fe746d6bbb modified: SRC/public/css/app.css
modified:   SRC/resources/views/admin.blade.php
	modified:   SRC/resources/views/referent.blade.php
2015-02-20 14:00:59 +01:00
Malibu 776940a70a modified: SRC/public/css/referent.css
modified:   SRC/resources/views/referent.blade.php
2015-02-20 12:49:51 +01:00
Jerome Morjon c41c6af4a1 maj referent non fini 2015-02-20 02:54:06 +01:00
Jerome Morjon 5b03b1ac6e Changement du theme de la nav bar
change du style de la nav bar
ajout de la tranparance
changement de la couleur de la police
ajout d’un css
2015-02-20 02:17:28 +01:00
Jerome Morjon ffeed0761c ajout caption 2015-02-20 01:32:02 +01:00
Jerome Morjon 167854e785 maj vue ref
ajout du switch des oeuvres + fix button
2015-02-20 01:28:03 +01:00
Jerome Morjon 4c8e483b99 fix button size bug 2015-02-20 01:09:05 +01:00
Jerome Morjon b32d8b5167 switch inséré 2015-02-20 00:58:51 +01:00
Jerome Morjon 6b88d2c9cd Merge remote-tracking branch 'origin/master'
Conflicts:
	SRC/public/css/referent.css
	SRC/resources/views/referent.blade.php
2015-02-19 23:02:35 +01:00
Jerome Morjon d80d18f9f0 maj css et button app.css 2015-02-19 23:02:06 +01:00
Malibu dd4f2c8241 m 2015-02-19 22:53:52 +01:00
sidya82 1ecdc1b3ff modifié : SRC/app/Http/Controllers/ReferentController.php
modifié :         SRC/public/js/ListeOeuvre.js
	modifié :         SRC/resources/views/referent.blade.php
2015-02-19 19:20:13 +01:00
sidya82 4fac5f8726 modifié : SRC/public/js/ListeOeuvre.js 2015-02-19 18:44:40 +01:00
sidya82 127f3dad65 modifié : SRC/public/js/ListeOeuvre.js 2015-02-19 18:21:04 +01:00
sidya82 2031282c06 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 18:13:46 +01:00
sidya82 634914e582 modifié : SRC/app/Http/Controllers/ReferentController.php
modifié :         SRC/app/Http/routes.php
	renommé :         SRC/public/js/getListeOeuvre.js -> SRC/public/js/ListeOeuvre.js
	supprimé :        SRC/public/js/setListeOeuvre.js
	modifié :         SRC/resources/views/app.blade.php
	modifié :         SRC/resources/views/referent.blade.php
2015-02-19 18:11:51 +01:00
Jerome Morjon fcb8a0a8fa maj css ref 2015-02-19 18:00:00 +01:00
Jerome Morjon 07095f6ac6 maj css ref 2015-02-19 18:00:00 +01:00
sidya82 5146b2f6af nouveau fichier : SRC/public/js/setListeOeuvre.js 2015-02-19 17:36:39 +01:00
sidya82 2a18c47789 modifié : SRC/app/Http/Controllers/ReferentController.php
modifié :         SRC/app/Http/routes.php
	modifié :         SRC/public/js/getListeOeuvre.js
2015-02-19 17:35:57 +01:00
Jerome Morjon d92ce6372d css ref 2015-02-19 17:29:04 +01:00
Malibu 70469b1e12 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 17:08:03 +01:00
Malibu f689ecef97 modified: SRC/public/js/getListeOeuvre.js
modified:   SRC/resources/views/home.blade.php
	modified:   SRC/resources/views/referent.blade.php
2015-02-19 17:07:41 +01:00
Jerome Morjon 4059881efd maj taille img 2015-02-19 16:56:05 +01:00
sidya82 465098a463 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 16:51:20 +01:00
sidya82 d41fdb2815 modifié : SRC/app/Http/Controllers/ReferentController.php
modifié :         SRC/public/js/getListeOeuvre.js
2015-02-19 16:50:36 +01:00
Jerome Morjon 400022380c maj home 2015-02-19 16:50:00 +01:00
Jerome Morjon dd386205b8 MAJ wallp 2015-02-19 16:45:25 +01:00
Malibu d22f90d8ce blabla 2015-02-19 15:37:52 +01:00
DonRenando dbf284c117 erreur2 2015-02-18 23:16:41 +01:00
DonRenando 8cc9176450 curseur2 2015-02-18 23:12:37 +01:00
DonRenando 357d903bb5 curseur 2015-02-18 23:03:16 +01:00