Commit Graph
35 Commits
Author SHA1 Message Date
www 4d24af0134 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-16 15:54:44 +01:00
www c0af5371a6 modified: SRC/resources/views/auth/reset.blade.php 2015-03-16 15:53:46 +01:00
www 2b1529105b modified: SRC/app/Http/Controllers/LoginController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/resources/views/auth/register.blade.php
	modified:   SRC/resources/views/auth/reset.blade.php
2015-03-16 15:40:12 +01:00
www b69f8c03b6 modified: SRC/config/mail.php 2015-03-16 14:20:24 +01:00
www ad9a5fa165 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-06 18:19:00 +01:00
www 4e17104833 modified: SRC/public/css/home.css 2015-03-06 18:18:23 +01:00
www f7b99d84c9 alaa 2015-03-05 19:27:08 +01:00
www 20c7a0255c modified: SRC/init/loadCSVAugust2014.py 2015-03-03 17:19:50 +01:00
www 77544b7ed4 new file: SRC/init/loadCSVAugust2014.py 2015-03-03 10:54:14 +01:00
www 3d2d69cf26 bug 2015-02-24 11:50:00 +01:00
www 7a427b2b4e Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-24 11:46:58 +01:00
www cd11f29a18 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-24 11:41:19 +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
www 4f8e9f9a38 bug 2015-02-24 11:34:35 +01:00
www ee5c34274c Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
Conflicts:
	SRC/app/Http/routes.php

	modified:   SRC/app/Http/Controllers/LoginController.php
	deleted:    SRC/app/Http/routes.php
	modified:   SRC/config/auth.php
	modified:   SRC/resources/views/auth/reset.blade.php
	modified:   SRC/resources/views/emails/password.blade.php
2015-02-18 23:32:05 +01:00
www 55660ca1e8 modified: SRC/app/Http/routes.php 2015-02-18 23:28:43 +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
www dc25fec393 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:54:33 +01:00
www 9e9323ab83 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:43:03 +01:00
www ea520351af Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:32:16 +01:00
www 4563ddfa54 lol 2015-02-18 18:32:12 +01:00
www 06114bba37 modified: SRC/app/Http/Middleware/RedirectIfNotAdmin.php 2015-02-18 01:24:30 +01:00
www 09ab8c15ee modified: .bash_history
modified:   SRC/app/Http/Middleware/RedirectIfNotAdmin.php
2015-02-18 01:23:17 +01:00
www 6469a4e793 modified: SRC/app/Http/Middleware/RedirectIfNotAdmin.php 2015-02-17 22:19:10 +01:00
www 3c35527b1e admin view & navbar_signed 2015-02-16 11:53:03 +01:00
www 71f60bc0be new file: SRC/config/database.php
modified:   SRC/database/seeds/DatabaseSeeder.php
2015-02-15 07:43:10 +01:00
www 9b16de6f92 modified: ../.gitignore
config/database.php
2015-02-15 07:35:42 +01:00
www a6815ad3ea laravel 5 2015-02-12 14:03:13 +01:00
www bf953986d9 update Lavarem to version 5 2015-02-12 13:56:47 +01:00
www e38d621e2c deleted: SRC/app/config/local/database.php 2015-02-08 22:58:51 +01:00
www b2869ad4b9 modified: .gitignore
deleted:    SRC/app/config/database.php
2015-02-08 22:57:02 +01:00
www 2f1aa2d596 new file: .gitconfig
modified:   .gitignore
	modified:   SRC/app/config/app.php
	new file:   SRC/app/controllers/testBd.php
	modified:   SRC/app/routes.php
	new file:   SRC/app/views/testBd.php
2015-02-08 22:43:20 +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