Commit Graph

5383 Commits

Author SHA1 Message Date
Juanjo Bazán
984984473f Fix conflict 2015-07-18 21:58:43 +02:00
Juanjo Bazán
b6d2a5efd6 uses new hash syntax by default 2015-07-18 21:49:36 +02:00
rgarcia
9cd3d77536 removes placeholder home 2015-07-18 21:38:13 +02:00
rgarcia
580eda9621 adds minimum decency styling 2015-07-18 21:29:39 +02:00
rgarcia
afdb0980b0 removes empty % sign when there are no votes 2015-07-18 21:27:56 +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
e006549092 adds votes to debates [#9] 2015-07-18 18:10:19 +02:00
rgarcia
28e36b76e2 fixing conflicts [#7] 2015-07-18 18:04:23 +02:00
rgarcia
e783c2013a sanitises tag names [#8] 2015-07-18 17:50:40 +02:00
rgarcia
fce0068bf4 fixing conflicts [#7] 2015-07-18 17:40:38 +02:00
rgarcia
98463e4930 adds comments to debates [#7] 2015-07-18 17:38:57 +02:00
rgarcia
12d35085e0 fixing conflicts [#8] 2015-07-18 17:30:31 +02:00
rgarcia
e20af8ab06 adds tag cloud [#8] 2015-07-18 17:24:30 +02:00
rgarcia
72bc790310 adds tags to debates [#8] 2015-07-18 17:24:16 +02:00
rgarcia
83ac9dc1fc displays terms of conditions in new and create [#11] 2015-07-18 17:20:30 +02:00
rgarcia
45094a86bc adds author to debates [#11] 2015-07-18 17:20:30 +02:00
rgarcia
c55021e18b fixing conflicts [#8] 2015-07-18 15:04:36 +02:00
rgarcia
9b4182250b displays terms of conditions in new and create [#11] 2015-07-18 14:49:57 +02:00
rgarcia
e92174e107 adds author to debates [#11] 2015-07-18 14:49:22 +02:00
rgarcia
9fa952c118 adds first name and last name to users 2015-07-18 14:47:04 +02:00
rgarcia
3108228cc7 adds user menu 2015-07-18 14:47:04 +02:00
rgarcia
75f1638cd6 fixing conflicts [#6] 2015-07-16 21:29:44 +02:00
rgarcia
a4ee10fd3f fixing specs [#5] 2015-07-16 20:27:09 +02:00
rgarcia
c24c78e5e7 fixing conflicts [#5] 2015-07-16 20:18:33 +02:00
rgarcia
e88832b5a3 fixing conflicts [#6] 2015-07-16 20:14:18 +02:00
Juanjo Bazán
24fb2765b9 Merge pull request #4 from AyuntamientoMadrid/capybara-4
Capybara configuration
2015-07-16 20:07:44 +02:00
rgarcia
f618a9f45d adds devise configuration [#6] 2015-07-16 19:47:54 +02:00
rgarcia
be342cac76 Basic CRU operations [#5] 2015-07-16 19:22:20 +02:00
rgarcia
7ba6fc50bb cherry picks capybara config [#5] 2015-07-16 19:16:04 +02:00
rgarcia
223eb06da2 configures capybara [#4] 2015-07-16 17:07:12 +02:00
rgarcia
155a96d8fc configures foundation #2 2015-07-16 17:03:05 +02:00
rgarcia
8db3630837 initial commit 2015-07-15 13:32:13 +02:00