consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,595 Commits 1 Branch 0 Tags
b5fd8cc8b293d52d29b52ffc8156537352031da0
Commit Graph

110 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
570169af57 Changes icons classes names 2015-08-22 14:46:26 +02:00
Alberto Garcia Cabeza
ff6285d114 Improves general styles 2015-08-21 18:57:09 +02:00
kikito
12e8cf2056 Allows flagging debates as inappropriate 2015-08-20 19:26:36 +02:00
Juanjo Bazán
b340d7741a adds hiding users by moderators 2015-08-20 13:16:37 +02:00
Juanjo Bazán
3732b7f420 adds pagination to 1st level comments in debate 
Ref: #80
 2015-08-19 16:32:39 +02:00
Juanjo Bazán
d2ac8b7f43 applies hidden users styles commented 2015-08-19 16:22:24 +02:00
Alberto Garcia Cabeza
2eccd30eff Adds styles for deleted users, improves previous 2015-08-19 15:01:10 +02:00
Alberto Garcia Cabeza
04db8112b4 Adds styles for associations comments 2015-08-19 11:53:35 +02:00
rgarcia
f31ed2940d adds moderation to comments and debates [#136] 2015-08-17 13:39:31 +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
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
Raimond Garcia
e49567c953 Merge pull request #154 from AyuntamientoMadrid/debates 
Debates
 2015-08-12 15:59:20 +02:00
Alberto Garcia Cabeza
d6c7528df3 Improves styles of debates show page 2015-08-12 15:26:46 +02:00
David Gil
19ef481917 adding counter_cache to comments children and WIPing on the issue 2015-08-12 14:58:36 +02:00
David Gil
44d4fa9fc4 order comments by the most recent first 2015-08-11 20:27:37 +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
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
rgarcia
ec6d34a49f fixes conflicts 2015-08-06 13:42:57 +02:00
Alberto Garcia Cabeza
f0be767ae8 Updates styles for debates show 2015-08-06 12:42:41 +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
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
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
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
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
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
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
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
20a762e556 Modifies debates show 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