Commit Graph

26 Commits

Author SHA1 Message Date
kikito
b28f63b016 merges master and fixes conflicts 2015-08-18 09:35:13 +02:00
Juanjo Bazán
7e1cd2940d Fix conflicts 2015-08-17 21:08:15 +02:00
Eloy Gomez
5b0cd4a8ba Show charts using c3.js 2015-08-17 19:15:17 +02:00
Juanjo Bazán
5c630ac41d adds settings area to admin 2015-08-17 18:38:57 +02:00
kikito
9e1581656a merges master and fixes conflicts 2015-08-17 17:38:34 +02:00
rgarcia
d9a31b7158 adds specs for moderation [#136] 2015-08-17 13:39:58 +02:00
kikito
8ca546a431 merges master and fixes conflicts 2015-08-17 02:40:11 +02:00
rgarcia
bea38226fe fixes spacing 2015-08-16 22:45:43 +02:00
Juanjo Bazán
b62729aac6 removes spanish fixed text from test factory 2015-08-15 22:19:01 +02:00
David Gil
664f656fe3 tests featured tags administration and adding featured tags to debates 2015-08-15 19:38:42 +02:00
kikito
19db7f9dda Updates factories to use the new organization table structure 2015-08-13 20:02:29 +02:00
kikito
cb301c4426 adds organization factory and refactors ability_spec 2015-08-12 18:24:57 +02:00
David Gil
6176e148f0 fix non working migration 2015-08-12 14:59:54 +02:00
Eloy Gomez
fe2080aff9 Display some stats 2015-08-08 14:33:44 +02:00
kikito
c04d397e66 Implements User.administrator? & User.moderator? 2015-08-07 17:20:20 +02:00
Juanjo Bazán
c3046ccc2b fixes build
adds empty featured_debates
2015-08-04 17:56:38 +02:00
Juanjo Bazán
0ca3d2501f fixes build 2015-07-31 14:54:49 +02:00
rgarcia
30102f88c8 fixes syntax error [#9] 2015-07-18 18:19:45 +02:00
rgarcia
b060ffaa17 fixing conflicts [#9] 2015-07-18 18:19:00 +02:00
rgarcia
73c3890027 fixing conflicts [#9] 2015-07-18 18:16:10 +02:00
rgarcia
090890f1ef adds votes feature specs [#9] 2015-07-18 18:10:36 +02:00
rgarcia
fce0068bf4 fixing conflicts [#7] 2015-07-18 17:40:38 +02:00
rgarcia
b7086bad4a adds comments feature specs [#7] 2015-07-18 17:39:12 +02:00
rgarcia
bcd96ab1b4 fixing specs [#11] 2015-07-18 15:09:06 +02:00
rgarcia
acc8be3b46 adds basic devise feature specs 2015-07-18 14:47:04 +02:00
rgarcia
8a3ca2a77f configures factory_girl [#5] 2015-07-16 19:24:54 +02:00