Commit graph

837 commits

Author SHA1 Message Date
Mehdi Arfaoui
256ccce3a0 Revert "Revert "MàJ Show subjects"
This reverts commit ccf311993c.
2016-02-07 03:11:06 +01:00
Mehdi Arfaoui
ccf311993c Revert "MàJ Show subjects
This reverts commit 5b82fba10c.

# Conflicts:
#	app/views/subjects/show.html.erb
2016-02-07 03:10:25 +01:00
Mehdi Arfaoui
d722a8fc50 Revert "Revert "Revert "Fix Show Subjects!!!"""
This reverts commit 5e37416f13a6fcc98e9844776006a6ad6e5bd583.
2016-02-07 03:10:24 +01:00
Mehdi Arfaoui
fbd81b602d Revert "Revert "Fix Show Subjects!!!""
This reverts commit f1a3a29b1096b9b3235a476e0342a6f07bc1b04f.
2016-02-07 03:10:23 +01:00
Mehdi Arfaoui
65c61d0adb Revert "Fix Show Subjects!!!"
This reverts commit 545e9ea0eb.
2016-02-07 03:10:22 +01:00
Marwann
1d0c9eaa01 Home Staging 🏡 2016-02-07 03:09:28 +01:00
Marwann
ccd5559c89 Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 03:05:10 +01:00
Mehdi Arfaoui
545e9ea0eb Fix Show Subjects!!! 2016-02-07 03:01:38 +01:00
Mehdi Arfaoui
3508f27d5d Fix Show subjects?? 2016-02-07 02:59:08 +01:00
Marwann
3a9b7f38ee Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 02:57:30 +01:00
Mehdi Arfaoui
e185274403 Fix Show Subjects 2016-02-07 02:57:03 +01:00
Marwann
8cbf1602b1 Home Decoration 🏠 2016-02-07 02:57:03 +01:00
Mehdi Arfaoui
a5dc61c9b2 Fix Show Subjects 2016-02-07 02:54:57 +01:00
Mehdi Arfaoui
ba1d8b6ca4 MàJ Reputation delete Subjects 2016-02-07 02:54:18 +01:00
Mehdi Arfaoui
5b82fba10c MàJ Show subjects 2016-02-07 02:52:21 +01:00
Marwann
fefc2c44a1 Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 02:49:11 +01:00
Marwann
5254a8ae2d Amélioration Home ajout floats 2016-02-07 02:48:44 +01:00
Mehdi Arfaoui
15037ef1a3 MàJ Subject show 2016-02-07 02:47:56 +01:00
thecarpathes
e61a920053 btn ajouter 2016-02-07 02:46:27 +01:00
thecarpathes
9f4fde703a btn size 2016-02-07 02:44:46 +01:00
Marwann
9bb7f0415b Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 02:42:44 +01:00
thecarpathes
d961cc18c7 btn 0px radius 2016-02-07 02:41:06 +01:00
Marwann
bded4df6e3 ajout float left right et bonne div id 2016-02-07 02:40:37 +01:00
Marwann
d1714ef4c8 Changes on Home page 2016-02-07 02:36:30 +01:00
Marwann
69d6ea30f0 Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 02:31:25 +01:00
Marwann
2af1650be3 Div Improvement on home 2016-02-07 02:30:59 +01:00
Mehdi Arfaoui
9011fe4b7a Fix show Public Figures 2016-02-07 02:30:03 +01:00
982eed4986 Merge remote-tracking branch 'origin/master' 2016-02-07 02:29:06 +01:00
7f78af9768 minor comment correction 2016-02-07 02:28:23 +01:00
Mehdi Arfaoui
a1bce13c2a Update Public Figure 2016-02-07 02:25:05 +01:00
e557a295ab changed authorization delete_public_figure => delete_personality 2016-02-07 02:23:51 +01:00
e46a98e057 edited Argument model 2016-02-07 02:14:08 +01:00
3ae94aace2 Added implied_public_figures accessor in Subject model 2016-02-07 02:04:47 +01:00
Mehdi Arfaoui
91dac00917 Fix home before jal push 2016-02-07 01:57:17 +01:00
Mehdi Arfaoui
e79fa3444e Add count on Home 2016-02-07 01:35:31 +01:00
Marwann
dece5ec1cb Letter Spacing h5n1 2016-02-07 01:34:23 +01:00
Marwann
491c8e56d5 Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 01:28:45 +01:00
Marwann
1851884434 Commit Merci Benjamin t'es le meilleur 👍 2016-02-07 01:28:18 +01:00
Mehdi Arfaoui
3e5514d47f MàJ Error 2016-02-07 01:27:04 +01:00
Mehdi Arfaoui
41aac007b8 MàJ Error 2016-02-07 01:22:24 +01:00
Mehdi Arfaoui
2a8f4bdaa0 MàJ error 2016-02-07 01:19:38 +01:00
Marwann
476d9b7daf Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 01:14:45 +01:00
Marwann
d0912667ae Text Shadow on "White" Class 🎱 2016-02-07 01:14:16 +01:00
Mehdi Arfaoui
fc04cc5758 MàJ error page 2016-02-07 01:13:45 +01:00
Mehdi Arfaoui
ff343dcbd1 ajout route error 2016-02-07 01:10:02 +01:00
Mehdi Arfaoui
181e0d2a20 home 🏄 2016-02-07 01:06:57 +01:00
Mehdi Arfaoui
7215de6836 Fix home text 2016-02-07 01:02:35 +01:00
Mehdi Arfaoui
569840abf5 Fix CSS 2016-02-07 00:58:39 +01:00
Mehdi Arfaoui
a16be26c69 H5 home 2016-02-07 00:56:36 +01:00
Marwann
49c404483f Commit Corrections des erreurs de Benjamin Filliol 2016-02-07 00:55:35 +01:00