Commit graph

837 commits

Author SHA1 Message Date
Mehdi Arfaoui
fe1a952bfc Margin Mode d'emploi 2016-02-06 19:33:34 +01:00
Mehdi Arfaoui
f08c49a11f MàJ mode d'emploi 2016-02-06 19:25:27 +01:00
Mehdi Arfaoui
f81e81a052 Fix Home 2016-02-06 18:56:36 +01:00
Mehdi Arfaoui
a8fd4f598d Revert "Fix home"
This reverts commit 0ae9c1c677.
2016-02-06 18:54:19 +01:00
Mehdi Arfaoui
0ae9c1c677 Fix home 2016-02-06 18:52:08 +01:00
Marwann
ec1dd8c9a9 Fix - Home.html.erb 2016-02-06 18:24:28 +01:00
Marwann
cf2ced7466 Commit de répétition
(home.html.erb)
2016-02-06 18:05:29 +01:00
Mehdi Arfaoui
5f3e68ee8b Added figures to homepage 2016-02-06 17:55:38 +01:00
Marwann
1391dc4e43 Fix <% end %> missing in home.html.erb 2016-02-06 17:48:34 +01:00
Marwann
441f31d6b8 Fix Home 2016-02-06 17:38:26 +01:00
Mehdi Arfaoui
92027284eb Add image home 2016-02-06 17:29:24 +01:00
Mehdi Arfaoui
145825d736 Ajout subjects home 2016-02-06 17:27:36 +01:00
Marwann
dfe9c79155 Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-06 17:23:16 +01:00
Marwann
a7d2ad41cf Ajout Home + Modification Controller Home 2016-02-06 17:22:49 +01:00
Mehdi Arfaoui
38e3af9e16 Reputation file modification 2016-02-06 16:37:53 +01:00
Marwann
ef28995e4f adding home controller 2016-02-06 16:31:50 +01:00
Marwann
d51531a279 commit 2016-02-06 16:25:40 +01:00
Marwann
3deb57a37f Adding route Home 2016-02-06 16:19:21 +01:00
Marwann
d9307f3391 Removing #404 routes 2016-02-06 15:56:08 +01:00
Marwann
18c215d339 Revert "rr"
This reverts commit ef5667028c328d6dc93e742ff5791d73ed204228.
2016-02-06 15:50:31 +01:00
Marwann
730737ec70 rr 2016-02-06 15:50:29 +01:00
Mehdi Arfaoui
1e892148d3 Added home folder 2016-02-06 15:49:24 +01:00
Mehdi Arfaoui
6f03730086 added home page image 2016-02-06 15:47:55 +01:00
Marwann
1ecb6c0c9f Revert "Création homepage"
This reverts commit 61d8b87381.
2016-02-06 15:06:35 +01:00
Marwann
905868e41e Revert "Création routes.rb home"
This reverts commit 8442d4a3c1.
2016-02-06 15:06:26 +01:00
Marwann
d6619e06d0 Revert "Modifications views 404 & Routes.rb"
This reverts commit 6c538124e6.
2016-02-06 15:06:17 +01:00
Marwann
7216cbf1c1 Revert "dd"
This reverts commit e05b27f01d.
2016-02-06 15:06:06 +01:00
Marwann
e05b27f01d dd
dd
2016-02-06 15:05:59 +01:00
Marwann
855af8931e Revert "Revert "avancement 404""
This reverts commit 8094dd3972.
2016-02-06 15:04:21 +01:00
Marwann
6c538124e6 Modifications views 404 & Routes.rb 2016-02-06 13:30:13 +01:00
Mehdi Arfaoui
8442d4a3c1 Création routes.rb home
# ROUTE HOME
resources :home,            path: 'home' do
end
2016-02-06 13:26:20 +01:00
Mehdi Arfaoui
61d8b87381 Création homepage 2016-02-06 13:20:40 +01:00
Marwann
9892346ed5 Création de routes et de views personnalisées pour les pages d'erreur
Il faudra "$ rails g controller Errors 404 422 500" @JalilArfaoui
2016-02-06 13:14:38 +01:00
Marwann
8094dd3972 Revert "avancement 404"
This reverts commit 809ae1c38d.
2016-02-06 13:05:04 +01:00
thecarpathes
809ae1c38d avancement 404 2016-02-06 12:55:25 +01:00
Marwann
b4cbb2a27a Revert "avancement 404"
This reverts commit a73bae45f1.
2016-02-06 12:51:39 +01:00
Marwann
4227e5e41a Revert "avancement 404"
This reverts commit 8e0099d6fb.
2016-02-06 12:51:32 +01:00
Marwann
5a074269dd Revert "update html 404"
This reverts commit a03811ae49.
2016-02-06 12:51:25 +01:00
thecarpathes
a03811ae49 update html 404 2016-02-06 12:40:37 +01:00
thecarpathes
8e0099d6fb avancement 404 2016-02-06 12:34:21 +01:00
thecarpathes
a73bae45f1 avancement 404
Conflicts:
	config/reputation.yml
2016-02-06 12:30:42 +01:00
Mehdi Arfaoui
22d8ef7fac Created 404 2016-02-06 12:06:53 +01:00
Mehdi Arfaoui
9a04ba99ea Mise à jour Réputation 2016-01-31 15:32:55 +01:00
Mehdi Arfaoui
842bdc2d69 Test 2016-01-31 13:51:26 +01:00
Mehdi Arfaoui
2bd42a5549 committerrand 2015-11-29 17:06:26 +01:00
Mehdi Arfaoui
8eb433f8f7 commit sans ms 2015-11-29 17:02:59 +01:00
Mehdi Arfaoui
c81efb4b0d lol 2015-11-29 16:59:57 +01:00
Mehdi Arfaoui
4b7563a337 Correct div subject 2015-11-29 16:57:02 +01:00
Mehdi Arfaoui
8f975af84f images figures in Subject 2015-11-29 16:55:22 +01:00
Mehdi Arfaoui
ab24b19f67 Fix previous commit 2015-11-29 16:47:59 +01:00