Juanjo Bazán
|
9a27bf9f79
|
updates travis.yml to make use of config files
|
2015-07-22 13:24:39 +02:00 |
|
Juanjo Bazán
|
12bad01d87
|
Merge pull request #28 from AyuntamientoMadrid/postgres
configures postgres
|
2015-07-22 13:04:21 +02:00 |
|
Alberto García Cabeza
|
8d0c326267
|
configures postgres
|
2015-07-22 13:01:52 +02:00 |
|
Raimond Garcia
|
e79dd1dc7a
|
Merge pull request #27 from AyuntamientoMadrid/20-edit-debate-permissions
Edit debate permissions
|
2015-07-19 16:55:37 +02:00 |
|
Juanjo Bazán
|
2a63d1f953
|
manages permissions for debate editing
|
2015-07-19 14:47:14 +02:00 |
|
Juanjo Bazán
|
df1a800d94
|
adds editable methods to Debate
|
2015-07-19 14:46:21 +02:00 |
|
Juanjo Bazán
|
bb5dc339fd
|
changes default title
|
2015-07-19 13:27:44 +02:00 |
|
Juanjo Bazán
|
63b6a44ca3
|
Merge pull request #26 from AyuntamientoMadrid/comment-styling
moves comment form to top of comments
|
2015-07-19 12:57:53 +02:00 |
|
rgarcia
|
bb46182f10
|
moves comment form to top of comments
|
2015-07-19 12:56:15 +02:00 |
|
Juanjo Bazán
|
ab5f28c4de
|
Merge branch 'cleanup'
|
2015-07-18 21:59:41 +02:00 |
|
Juanjo Bazán
|
984984473f
|
Fix conflict
|
2015-07-18 21:58:43 +02:00 |
|
Raimond Garcia
|
d29d2ca65d
|
Merge pull request #18 from AyuntamientoMadrid/syntax
Uses new hash syntax by default
|
2015-07-18 21:53:40 +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
|
2eb0602097
|
fixes specs
|
2015-07-18 21:37:15 +02:00 |
|
rgarcia
|
60ae203d0a
|
Merge branch 'master' into cleanup
|
2015-07-18 21:35:21 +02:00 |
|
rgarcia
|
580eda9621
|
adds minimum decency styling
|
2015-07-18 21:29:39 +02:00 |
|
rgarcia
|
2bd2ceaf59
|
makes debates/index the root url
|
2015-07-18 21:28:38 +02:00 |
|
rgarcia
|
afdb0980b0
|
removes empty % sign when there are no votes
|
2015-07-18 21:27:56 +02:00 |
|
Juanjo Bazán
|
6d0d895832
|
Merge pull request #16 from AyuntamientoMadrid/rspec
Rspec cleanup
|
2015-07-18 20:58:41 +02:00 |
|
rgarcia
|
06ca0fd06b
|
removes duplicate spec_helper loading
Thanks @taitus
|
2015-07-18 20:43:31 +02:00 |
|
rgarcia
|
910f5a79a1
|
removes sample pending spec
|
2015-07-18 20:38:01 +02:00 |
|
rgarcia
|
49ee8d0397
|
removes spec focus
|
2015-07-18 20:37:51 +02:00 |
|
Juanjo Bazán
|
797160f108
|
Merge pull request #9 from AyuntamientoMadrid/votes-9
Votes for debates
|
2015-07-18 18:26:24 +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 |
|
Juanjo Bazán
|
c367681a3c
|
Merge pull request #7 from AyuntamientoMadrid/comments-7
Commets for debates
|
2015-07-18 18:12:15 +02:00 |
|
rgarcia
|
090890f1ef
|
adds votes feature specs [#9]
|
2015-07-18 18:10:36 +02:00 |
|
rgarcia
|
e006549092
|
adds votes to debates [#9]
|
2015-07-18 18:10:19 +02:00 |
|
rgarcia
|
b8e41551f9
|
configures acts_as_votable [#9]
|
2015-07-18 18:09:48 +02:00 |
|
rgarcia
|
28e36b76e2
|
fixing conflicts [#7]
|
2015-07-18 18:04:23 +02:00 |
|
Juanjo Bazán
|
233b9bbbc2
|
Merge pull request #8 from AyuntamientoMadrid/tags-8
Adds tags
|
2015-07-18 17:59:50 +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
|
b7086bad4a
|
adds comments feature specs [#7]
|
2015-07-18 17:39:12 +02:00 |
|
rgarcia
|
98463e4930
|
adds comments to debates [#7]
|
2015-07-18 17:38:57 +02:00 |
|
rgarcia
|
05705f3174
|
configures act_as_commentable_with_threading gem [#7]
|
2015-07-18 17:38:33 +02:00 |
|
rgarcia
|
dc8969781a
|
cleans up schema [#8]
|
2015-07-18 17:33:45 +02:00 |
|
rgarcia
|
12d35085e0
|
fixing conflicts [#8]
|
2015-07-18 17:30:31 +02:00 |
|
rgarcia
|
eb083c700b
|
adds tags feature specs [#8]
|
2015-07-18 17:28:15 +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
|
6adedf45b8
|
configures act_as_taggable [#8]
|
2015-07-18 17:23:00 +02:00 |
|
rgarcia
|
1f725a2c51
|
removes unused association [#11]
|
2015-07-18 17:20:30 +02:00 |
|
rgarcia
|
0cb0a691c8
|
adds author validation spec [#11]
|
2015-07-18 17:20:30 +02:00 |
|
rgarcia
|
4ed8881116
|
fixing specs [#11]
|
2015-07-18 17:20:30 +02:00 |
|
rgarcia
|
6430693b85
|
updates specs for debate authors [#11]
|
2015-07-18 17:20:30 +02:00 |
|
rgarcia
|
83ac9dc1fc
|
displays terms of conditions in new and create [#11]
|
2015-07-18 17:20:30 +02:00 |
|
rgarcia
|
20e31def2e
|
adds convenience methods and association [#11]
|
2015-07-18 17:20:30 +02:00 |
|