Commit Graph

139 Commits

Author SHA1 Message Date
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
DonRenando 4cbb358f48 CSS4 2015-02-18 22:49:48 +01:00
DonRenando 278fa55ed8 CSS3 2015-02-18 22:17:31 +01:00
DonRenando 416ddb7a16 CSS2 2015-02-18 21:15:20 +01:00
DonRenando c8c4e3b9c6 CSS 2015-02-18 19:52:26 +01:00
Malibu e674d9ef88 ll 2015-02-18 19:18:15 +01:00
Malibu 2cdcfb3b01 add folder picture 2015-02-18 19:16:30 +01:00
www 846ef181b1 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 19:12:25 +01:00
www 06c3795823 tt 2015-02-18 19:12:05 +01:00
Malibu cd05e345e5 blabla 2015-02-18 19:04:49 +01:00
Malibu 2f0ad27af9 blabla 2015-02-18 18:59:02 +01:00
matthieupenchenat81 d4c519a357 Delete 5 2015-02-18 18:54:58 +01:00
matthieupenchenat81 31f0415ea1 Delete 3 2015-02-18 18:54:51 +01:00
matthieupenchenat81 b94e5f2b29 Delete 2 2015-02-18 18:54:45 +01:00
matthieupenchenat81 06fb78e8e8 Delete 1 2015-02-18 18:54:37 +01:00
www dc25fec393 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:54:33 +01:00
Malibu 5c2b07d715 modified: SRC/public/css/app.css
modified:   SRC/resources/views/home.blade.php
2015-02-18 18:51:07 +01:00
www 9e9323ab83 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:43:03 +01:00
Malibu 531a337208 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:42:41 +01:00
DonRenando 21c28b0ad6 rechercher 2015-02-18 18:42:00 +01:00
Malibu 6dc2dd41a1 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:41:09 +01:00
Malibu 99b3bff06d fix upload in User model 2015-02-18 18:40:00 +01:00
www 4563ddfa54 lol 2015-02-18 18:32:12 +01:00
DonRenando fe922c47b0 taille max 2015-02-18 18:27:58 +01:00
Malibu fed82155dc update 2015-02-18 18:13:47 +01:00
DonRenando 2781c482c1 avatar referent 2015-02-18 17:58:11 +01:00
Malibu 1f7bc48129 fix upload_ref 2015-02-18 17:00:02 +01:00
Malibu 3425dc66d9 upload picture 2015-02-18 16:49:02 +01:00
Malibu 75548c78f2 delete user 2015-02-17 21:57:41 +01:00
Malibu 4a5dbde1c9 update navbar 2015-02-17 21:12:16 +01:00
Jerome Morjon 50d7803a7c maj du block ref 2015-02-16 03:34:48 +01:00
Jerome Morjon b94a1c7cba maj de la page d'acceuil
création d’un repertoire image
maj du app.css
maj du home.blade.php
selection d’un fond d’ecran
j’ai ajouté des users dans la bdd
2015-02-16 02:41:12 +01:00
sidya82 af395a32ef identification 2015-02-15 07:12:44 +01:00
Malibu 9876d6ee17 fix Glyphicons not found 2015-02-13 23:02:17 +01:00
Malibu e1148d1a43 template referent 2015-02-13 00:59:13 +01:00
Malibu e28cd6d653 template login/home 2015-02-12 18:58:03 +01:00
Malibu eaac04fc51 update laravel 5 2015-02-12 13:39:52 +01:00
Malibu a4326d6aec rm src 2015-02-12 13:27:01 +01:00
Malibu 822a583633 update Laravel 5 2015-02-12 13:25:15 +01:00
www c596984f81 new file: SRC/.bash_history
new file:   SRC/.gitattributes
	new file:   SRC/.gitignore
	new file:   SRC/CONTRIBUTING.md
	new file:   SRC/app/commands/.gitkeep
	new file:   SRC/app/config/app.php
	new file:   SRC/app/config/auth.php
	new file:   SRC/app/config/cache.php
	new file:   SRC/app/config/compile.php
	new file:   SRC/app/config/database.php
	new file:   SRC/app/config/local/app.php
	new file:   SRC/app/config/local/database.php
	new file:   SRC/app/config/mail.php
	new file:   SRC/app/config/packages/.gitkeep
	new file:   SRC/app/config/queue.php
	new file:   SRC/app/config/remote.php
	new file:   SRC/app/config/services.php
	new file:   SRC/app/config/session.php
	new file:   SRC/app/config/testing/cache.php
	new file:   SRC/app/config/testing/session.php
	new file:   SRC/app/config/view.php
	new file:   SRC/app/config/workbench.php
	new file:   SRC/app/controllers/.gitkeep
	new file:   SRC/app/controllers/BaseController.php
	new file:   SRC/app/controllers/HomeController.php
	new file:   SRC/app/database/.gitignore
	new file:   SRC/app/database/migrations/.gitkeep
	new file:   SRC/app/database/seeds/.gitkeep
	new file:   SRC/app/database/seeds/DatabaseSeeder.php
	new file:   SRC/app/filters.php
	new file:   SRC/app/lang/en/pagination.php
	new file:   SRC/app/lang/en/reminders.php
	new file:   SRC/app/lang/en/validation.php
	new file:   SRC/app/models/User.php
	new file:   SRC/app/routes.php
	new file:   SRC/app/start/artisan.php
	new file:   SRC/app/start/global.php
	new file:   SRC/app/start/local.php
	new file:   SRC/app/storage/.gitignore
	new file:   SRC/app/storage/cache/.gitignore
	new file:   SRC/app/storage/logs/.gitignore
	new file:   SRC/app/storage/meta/.gitignore
	new file:   SRC/app/storage/sessions/.gitignore
	new file:   SRC/app/storage/views/.gitignore
	new file:   SRC/app/tests/ExampleTest.php
	new file:   SRC/app/tests/TestCase.php
	new file:   SRC/app/views/emails/auth/reminder.blade.php
	new file:   SRC/app/views/hello.php
	new file:   SRC/artisan
	new file:   SRC/bootstrap/autoload.php
	new file:   SRC/bootstrap/paths.php
	new file:   SRC/bootstrap/start.php
	new file:   SRC/composer.json
	new file:   SRC/phpunit.xml
	new file:   SRC/public/.htaccess
	new file:   SRC/public/favicon.ico
	new file:   SRC/public/home.jpg
	new file:   SRC/public/home.png
	new file:   SRC/public/index.php
	new file:   SRC/public/packages/.gitkeep
	new file:   SRC/public/robots.txt
	new file:   SRC/readme.md
	new file:   SRC/server.php
2015-02-03 17:04:12 +01:00