rgarcia
|
cd2d05e0c5
|
fixing conflicts [#47] [#47]
|
2015-07-30 18:19:38 +02:00 |
|
kikito
|
affda6b4c5
|
merges master and fixes conflicts
|
2015-07-29 19:14:06 +02:00 |
|
kikito
|
a4bc9ed08f
|
removes conflict code which was left there by mistake
|
2015-07-29 18:45:10 +02:00 |
|
Alberto Garcia Cabeza
|
0efa9c77f1
|
Adds new styles for debates show
|
2015-07-29 17:47:05 +02:00 |
|
kikito
|
c495d4678c
|
merges master and fixes conflicts
|
2015-07-29 17:13:09 +02:00 |
|
Juanjo Bazán
|
08671414f2
|
removes hashrockets
|
2015-07-29 14:27:58 +02:00 |
|
rgarcia
|
95101c4cc8
|
fixing conflicts [#45]
|
2015-07-29 13:36:48 +02:00 |
|
kikito
|
b87331c958
|
merges master and fixes conflicts
|
2015-07-29 13:00:33 +02:00 |
|
kikito
|
c71182f6a6
|
Adds classes to several buttons so they don't look ugly
|
2015-07-29 12:54:51 +02:00 |
|
rgarcia
|
1deecea0af
|
adds wysiwyg to debate description
|
2015-07-28 21:46:01 +02:00 |
|
rgarcia
|
bdcd513f26
|
responds with ajax to debate vote [#47]
|
2015-07-28 20:52:59 +02:00 |
|
rgarcia
|
81a5ddb580
|
refactors recaptchable helper [#45]
|
2015-07-28 18:32:45 +02:00 |
|
Enrique García
|
5860efe35d
|
Merge pull request #46 from AyuntamientoMadrid/beautification
Beautification
|
2015-07-28 16:50:32 +02:00 |
|
Juanjo Bazán
|
e9c1910d7d
|
adds i18n to debates' interface
|
2015-07-28 16:48:36 +02:00 |
|
kikito
|
d5710c8dc6
|
Removes '|' after button in debates/show
The rest of the commit noise is trailing spaces :(
|
2015-07-28 16:32:07 +02:00 |
|
rgarcia
|
1609f6970f
|
displays debates next to each other
|
2015-07-28 13:55:15 +02:00 |
|
rgarcia
|
cc3f151914
|
fixing conflicts
|
2015-07-27 23:29:32 +02:00 |
|
rgarcia
|
137267887c
|
fixes specs
|
2015-07-27 23:21:15 +02:00 |
|
Alberto García Cabeza
|
c0a5200c10
|
Adds styles for debates show
|
2015-07-27 22:01:13 +02:00 |
|
Alberto García Cabeza
|
c2c176db75
|
Improves styles for debates home
|
2015-07-27 21:20:20 +02:00 |
|
rgarcia
|
cbef22606e
|
adds recaptcha verification to debates
|
2015-07-27 18:44:33 +02:00 |
|
Alberto García Cabeza
|
20a762e556
|
Modifies debates show
|
2015-07-26 23:14:43 +02:00 |
|
Alberto García Cabeza
|
f4c7b0edda
|
Includes first styles for header and debates
|
2015-07-26 23:14:43 +02:00 |
|
Juanjo Bazán
|
2a63d1f953
|
manages permissions for debate editing
|
2015-07-19 14:47:14 +02:00 |
|
rgarcia
|
bb46182f10
|
moves comment form to top of comments
|
2015-07-19 12:56:15 +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
|
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
|
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
|
be342cac76
|
Basic CRU operations [#5]
|
2015-07-16 19:22:20 +02:00 |
|