consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
487 Commits 1 Branch 0 Tags
1de941d1facb1b88f9d6967c3ef28e8460419270
Commit Graph

93 Commits

Author SHA1 Message Date
David Gil
1de941d1fa adding featured tags list to debate form 2015-08-15 18:36:10 +02:00
Alberto Garcia Cabeza
09d71ad84f Merge branch 'master' into improving_debates 
Conflicts:
	app/assets/stylesheets/debates.scss
	app/assets/stylesheets/participacion.scss
 2015-08-15 01:45:56 +02:00
Alberto Garcia Cabeza
4d8b0a01ce Includes count number of comments on debate show 2015-08-15 01:13:34 +02:00
Alberto Garcia Cabeza
f98510cea7 Improves styles for simple captcha 2015-08-15 01:05:00 +02:00
David Gil
2b16716ee1 add author-photo css class to author avatar 2015-08-14 21:16:53 +02:00
David Gil
bf95e55345 more explicit and versatile usage of avatar_image, changing style option by a direct size - asuming we will always use square images 2015-08-14 21:15:59 +02:00
David Gil
925921d605 adding initial.js to show Gmail-like user avatars; adding avatar_image helper to abstract from plugin options adding the two currently used styles, profile and small 2015-08-14 21:15:59 +02:00
David Gil
06d8c96d54 Limiting max number of tags shown on debate cards ~ issue#144 2015-08-12 16:26:41 +02:00
Raimond Garcia
e49567c953 Merge pull request #154 from AyuntamientoMadrid/debates 
Debates
 2015-08-12 15:59:20 +02:00
Alberto Garcia Cabeza
ea5612c5bd Modifies styles welcome and debates index 2015-08-12 15:27:28 +02:00
Alberto Garcia Cabeza
d6c7528df3 Improves styles of debates show page 2015-08-12 15:26:46 +02:00
David Gil
0291f574a2 add vote counters to comments 2015-08-12 14:59:21 +02:00
David Gil
19ef481917 adding counter_cache to comments children and WIPing on the issue 2015-08-12 14:58:36 +02:00
Enrique García
1299987272 Merge pull request #146 from dgilperez/issue-142 
Fixes #142
 2015-08-12 10:50:38 +02:00
Enrique García
d243d81fea Merge pull request #150 from AyuntamientoMadrid/votes 
Avoid voting by not logged users
 2015-08-12 10:15:06 +02:00
Juanjo Bazán
0541e9e936 shows not-logged votes on hover if user not logged 
Fixes #85
 2015-08-11 23:20:42 +02:00
David Gil
44d4fa9fc4 order comments by the most recent first 2015-08-11 20:27:37 +02:00
Alberto Garcia Cabeza
3cddc1070a Adds styles for not logged votes 2015-08-11 17:40:27 +02:00
rgarcia
4dd7e14ac4 moves featured debates to home page 2015-08-11 17:26:25 +02:00
Alberto Garcia Cabeza
d5c27b36d5 Improves styles for debate show and comments 2015-08-11 13:16:24 +02:00
Alberto Garcia Cabeza
f9e0dad7a2 Adds links on comments title 2015-08-11 12:00:54 +02:00
Juanjo Bazán
f36f408f63 fixes votes in debates' show 
Closes #135
 2015-08-11 10:57:48 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +02:00
Fernando Seror
6d20972f34 Share in social networks 
* Add the social buttons gem to the Gemfile

* Initializer and translations for the social buttons

* Add the social buttons assets to the sprockets require

* Add the social buttons in the show debate view

* Spec to lock down the amount of social share buttons to three
 2015-08-10 11:00:39 -05:00
Juanjo Bazán
37199125fa refactors votes view code to helper 2015-08-07 09:19:02 +02:00
Juanjo Bazán
cdaa3e2808 favors dom_id 2015-08-06 18:53:40 +02:00
Juanjo Bazán
33489e7b0c adds css classes to voted options in debates 
for logged users.
Closes #88
 2015-08-06 18:53:05 +02:00
Juanjo Bazán
8d36487cd0 Merge pull request #105 from AyuntamientoMadrid/description_link 
adds link to debate description
 2015-08-06 18:09:44 +02:00
Alberto Garcia Cabeza
1067d2272e Adds styles for debate new 2015-08-06 17:59:22 +02:00
rgarcia
ae34be1ddd adds link to debate description 2015-08-06 15:50:36 +02:00
Juanjo Bazán
44e049e483 Merge pull request #104 from AyuntamientoMadrid/debates_title_length_93 
Debates title length
 2015-08-06 15:25:16 +02:00
kikito
5c141e36ab uses the debate title length in the debates form 2015-08-06 14:01:48 +02:00
rgarcia
ec6d34a49f fixes conflicts 2015-08-06 13:42:57 +02:00
Alberto Garcia Cabeza
56f480d5c0 Improves CSS styles for votes 2015-08-06 12:53:19 +02:00
Alberto Garcia Cabeza
f0be767ae8 Updates styles for debates show 2015-08-06 12:42:41 +02:00
Alberto Garcia Cabeza
77ecf39852 Updates styles for debates index 2015-08-06 11:19:37 +02:00
Juanjo Bazán
ae8068f5fd fix conflict 2015-08-05 14:46:18 +02:00
Juanjo Bazán
8d87a69e0f hides comment forms from not logged users 
Closes #66
 2015-08-05 14:12:58 +02:00
rgarcia
fa5b678b69 fixes conflicts with master [#25] 2015-08-05 13:47:23 +02:00
rgarcia
5ce8db002b adds vote partial for debate index [#25] 2015-08-05 12:24:22 +02:00
rgarcia
91b52ad8d2 refactors voting implementation [#25] 2015-08-05 12:24:22 +02:00
kikito
fc4e67824b Merge branch 'master' into debates_description_html 
I removed the truncation from debates.description because
debates.description returns html

Conflicts:
	app/views/debates/_debate.html.erb
	app/views/debates/show.html.erb
 2015-08-04 19:07:20 +02:00
kikito
1fa4087bef Removes all the extra sanitisation from debates 
This makes the feature red
 2015-08-04 18:42:05 +02:00
Juanjo Bazán
a2ea42d13d adds first 3 debates as featured_debates 2015-08-04 18:41:09 +02:00
Juanjo Bazán
c3046ccc2b fixes build 
adds empty featured_debates
 2015-08-04 17:56:38 +02:00
Alberto Garcia Cabeza
4344bc121f Changes styles for debates index and debate show 2015-08-04 13:25:00 +02:00
rgarcia
2a3086010e adds voting for comments functionality [#25] 2015-08-02 13:37:37 +02:00
kikito
e277959274 Allow rendering the description with html_safe 
We made sure that it is properly sanitised before allowing this.
 2015-07-31 16:11:10 +02:00
Raimond Garcia
2ea638967b Merge pull request #64 from AyuntamientoMadrid/auth 
Adds styles for authentication pages
 2015-07-31 05:25:46 +02:00
Alberto Garcia Cabeza
851aefbaa6 Adds styles for authentication pages 2015-07-30 19:51:33 +02:00