Commit Graph

93 Commits

Author SHA1 Message Date
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