Commit Graph

70 Commits

Author SHA1 Message Date
rgarcia
e555126331 tracks debate visits from the controller 2015-09-09 14:41:19 +02:00
rgarcia
339e978237 default order confidence_score for home and debate index 2015-09-08 14:47:58 +02:00
Juanjo Bazán
3845e6bfd2 shows visible children of hidden comments
Fixes #368
2015-09-06 12:55:44 +02:00
rgarcia
e751c53a5d converts necessary variables to instance variables 2015-09-05 22:02:51 +02:00
Juanjo Bazán
b020795d3d adds search to debates index 2015-09-05 15:20:46 +02:00
kikito
7c3ca55de1 Adds the default score selector/controller. Refactors debates specs 2015-09-04 11:50:07 +02:00
Juanjo Bazán
559b60e63f adds random order to debates' index 2015-09-03 18:50:19 +02:00
Juanjo Bazán
dbfa35c444 adds 'most commented' order to debates 2015-09-03 18:31:16 +02:00
Juanjo Bazán
cd3806476f removes 'most voted' order from debates 2015-09-03 18:20:12 +02:00
Juanjo Bazán
bcb1f2ba72 adds order by score to debates 2015-09-03 18:13:48 +02:00
Juanjo Bazán
358028c3e6 Fixes conflicts. Merge branch 'master' into ancestry 2015-09-03 16:37:28 +02:00
Juanjo Bazán
136c1e73ed uses ancestry to retrieve debate comments 2015-09-03 16:32:54 +02:00
kikito
e2b405083c merges master and fixes conflicts 2015-09-03 12:02:16 +02:00
kikito
b23bd2c94d Fixes tag cloud
* Makes order work
* Limits it to the first 20 in Debates#index
Fixes #338
2015-09-03 11:50:58 +02:00
kikito
3f98ab74b0 Makes tag checking more efficient in Debates#index
1) Only loads the tags if params[:tag] is present
2) Only checks for existence of the tag, instead of loading them all
and getting their names
2015-09-03 11:18:39 +02:00
kikito
e0f8f8d8de Removes Debate.search & uses Debate.tagged_by when appropriate
Using `params` was wrong here because if given an inexistent tag,
@tag_filter was nil but the debates were still filtered by it (so the
listing and what the page title said were different)
2015-09-03 11:17:21 +02:00
Juanjo Bazán
dee2d0196b ancestries
moves to ancestry from acts_as_commentable_with_threading
2015-09-02 19:23:09 +02:00
Juanjo Bazán
872a23443b updates anonymous counter in debate when voted
refactors to move all related code to Debate model
2015-09-01 17:49:02 +02:00
Juanjo Bazán
bbf96259fc adds controller check for anonymous votes 2015-09-01 17:49:02 +02:00
kikito
99fd0a917d Uses @comment_flags in everything comment-related 2015-09-01 13:10:19 +02:00
kikito
27ece220f6 Transform Flag.flag! & unflag! into non-raising methods
They now return false and do nothing instead
2015-08-31 19:02:50 +02:00
jjballano
46f334f38c #225 : refactor 2015-08-29 18:43:23 +01:00
kikito
ae98ba3572 merges master and fixes conflicts 2015-08-28 19:57:28 +02:00
Raimond Garcia
b1117dd1af Merge pull request #275 from mlovic/filter-topic
Allow debates to be filtered by topic
2015-08-28 17:41:38 +02:00
Marko Lovic
4285ba4bb3 Add tag filter to debates page 2015-08-28 12:41:10 +02:00
kikito
76c2f2f021 Merge branch 'master' into flag-renaming 2015-08-27 19:06:29 +02:00
Marko Lovic
b6df3be8c0 Change Debate.sort_by method for individual scopes 2015-08-27 15:24:59 +02:00
Marko Lovic
6f32801a88 Change names of debate order filters
* 'news' to 'created_at'
* 'votes' to 'total_votes'
* 'rated' to 'likes'
2015-08-27 15:24:59 +02:00
Marko Lovic
2d48966de3 Change variable name and references from "filter" to "order" 2015-08-27 15:24:59 +02:00
Marko Lovic
ccaca54816 Add filters to specify order of debates#index 2015-08-27 15:24:59 +02:00
kikito
909dfb4ce3 Several renamings
InappropiateFlag -> Flag
x.flag_as_inappropiate -> x.flag
x.undo_flag_as_inappropiate -> x.unflag
X.flagged_as_inappropiate -> x.flagged
flag-as-inappropiate-actions views & css -> flag-actions views & css
2015-08-27 10:48:49 +02:00
kikito
48ef4df0c3 Adds Comment#for_render 2015-08-26 19:41:42 +02:00
kikito
9112cacde4 Adds Debate#for_render 2015-08-26 19:40:37 +02:00
kikito
c88f7c1f30 merges master and fixes conflicts 2015-08-23 20:27:11 +02:00
kikito
12e8cf2056 Allows flagging debates as inappropriate 2015-08-20 19:26:36 +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
947514fbfc adds pagination to debates#index
Ref: #80
2015-08-19 16:30:25 +02:00
Juanjo Bazán
ced2a05063 adds eager loading to avoid N+1 queries 2015-08-18 16:54:49 +02:00
Juanjo Bazán
7e1cd2940d Fix conflicts 2015-08-17 21:08:15 +02:00
rgarcia
f31ed2940d adds moderation to comments and debates [#136] 2015-08-17 13:39:31 +02:00
rgarcia
bea38226fe fixes spacing 2015-08-16 22:45:43 +02:00
Juanjo Bazán
aeceaf9ea8 fixes bug: edit Debate was not validating captcha 2015-08-15 23:51:30 +02:00
Juanjo Bazán
8cb654092b Merge pull request #176 from dgilperez/issue-172
Adds CRUD for tags to admin section and featured tags support for debates
2015-08-15 22:00:37 +02:00
David Gil
308d71e517 remove unused method 2015-08-15 20:05:33 +02:00
David Gil
1de941d1fa adding featured tags list to debate form 2015-08-15 18:36:10 +02:00
rgarcia
9f2d60c4ce refactors voted debates 2015-08-15 14:57:41 +02:00
David Gil
10588a989c revert using pluck to use map again 2015-08-12 00:02:19 +02:00
David Gil
44d4fa9fc4 order comments by the most recent first 2015-08-11 20:27:37 +02:00
rgarcia
4dd7e14ac4 moves featured debates to home page 2015-08-11 17:26:25 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +02:00