consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

424 Commits

Author SHA1 Message Date
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
rgarcia
5bdc3fbaa0 updates correct dom element after voting [#47] 2015-07-30 18:45:17 +02:00
rgarcia
cd2d05e0c5 fixing conflicts [#47] [#47] 2015-07-30 18:19:38 +02:00
Alberto Garcia Cabeza
d8d03604b9 Adds styles for comments 2015-07-30 13:59:35 +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