Commit graph

565 commits

Author SHA1 Message Date
thecarpathes
7b61470eb1 modal 2016-02-07 04:12:39 +01:00
Mehdi Arfaoui
3f41cb3cb5 Public figure count fix 2016-02-07 04:09:57 +01:00
Marwann
c57d2b1b6e Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 04:08:44 +01:00
Marwann
255e712dd5 Test full width vw 2016-02-07 04:08:13 +01:00
Mehdi Arfaoui
02a3cbf5b5 fix public figure .name 2016-02-07 04:05:35 +01:00
1ce45ab4e4 test 2016-02-07 04:01:03 +01:00
Marwann
e46425c343 Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 03:52:31 +01:00
Marwann
510d1c7c5c Associated Public Figures 👊 2016-02-07 03:51:55 +01:00
Mehdi Arfaoui
01f65dcab5 Update controller 2016-02-07 03:49:35 +01:00
Mehdi Arfaoui
66fa76e4cc Allow delete subject 2016-02-07 03:46:18 +01:00
thecarpathes
3459cfd4db btn edit radius 2016-02-07 03:45:49 +01:00
thecarpathes
535ac54e4b btn color 2016-02-07 03:45:02 +01:00
9eec2b25ee Merge remote-tracking branch 'origin/master' 2016-02-07 03:43:30 +01:00
0f74300834 updated public_figures/show page 2016-02-07 03:43:04 +01:00
5526fdd108 added "associated_public_figures" and "get_positions_for_public_figure" to Subject model 2016-02-07 03:42:40 +01:00
fcd724ab8e added "associated_subjects" to PublicFigure model 2016-02-07 03:41:42 +01:00
Mehdi Arfaoui
eb784b1021 Update Reputation 2016-02-07 03:41:37 +01:00
thecarpathes
cf80370388 btn 2016-02-07 03:40:59 +01:00
Marwann
4b8ed7c2e3 Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 03:35:33 +01:00
Marwann
c604fd49f3 Resize public figure face 👍 2016-02-07 03:35:03 +01:00
Mehdi Arfaoui
1548202652 Show subject reputation 2016-02-07 03:34:37 +01:00
Marwann
0062bf73f6 Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 03:30:55 +01:00
Marwann
af98c937a3 Merge branch 'master' of https://github.com/Tiqa/Debats 2016-02-07 03:30:05 +01:00
Mehdi Arfaoui
bd23330d35 Show subject fix 2016-02-07 03:29:48 +01:00
Marwann
636e497ee0 Pansements page Home 🏥 2016-02-07 03:29:34 +01:00
Mehdi Arfaoui
d0e03372d0 Revert manuel show subject 2016-02-07 03:27:56 +01:00
Marwann
99e4d9f0de Correction du probleme de CSS 2016-02-07 03:23:27 +01:00
Mehdi Arfaoui
feafda813a Revert "Revert "Revert "Revert "Fix Show Subjects!!!""""
This reverts commit d722a8fc50.
2016-02-07 03:11:11 +01:00
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