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 |
|
kikito
|
51323fa891
|
Adds back missing authenticate_user! calls
|
2015-08-10 16:05:58 +02:00 |
|
kikito
|
c1c1362780
|
Adapts debates controller to new permissions system
|
2015-08-10 15:00:14 +02:00 |
|
Eloy Gomez
|
b23ca8deb1
|
Create event on debate creation
|
2015-08-08 13:08:48 +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 |
|
rgarcia
|
ec6d34a49f
|
fixes conflicts
|
2015-08-06 13:42:57 +02:00 |
|
Juanjo Bazán
|
062ef365ad
|
vote action not allowed for unauthenticated users
|
2015-08-05 14:34:55 +02:00 |
|
rgarcia
|
fa5b678b69
|
fixes conflicts with master [#25]
|
2015-08-05 13:47:23 +02:00 |
|
rgarcia
|
91b52ad8d2
|
refactors voting implementation [#25]
|
2015-08-05 12:24:22 +02:00 |
|
kikito
|
08fdc768b2
|
fix wrong merge with master
|
2015-08-05 12:17:27 +02:00 |
|
kikito
|
d7a9f05cc5
|
merges master and fixes conflicts
|
2015-08-05 12:07:54 +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 |
|
rgarcia
|
823426bfde
|
verify captcha only when captcha keys present
|
2015-08-04 12:54:24 +02:00 |
|
rgarcia
|
daab640dd2
|
refactoring recaptcha
|
2015-07-27 18:48:30 +02:00 |
|
rgarcia
|
23fc19f4b0
|
fixing specs
|
2015-07-27 18:46:13 +02:00 |
|
rgarcia
|
cbef22606e
|
adds recaptcha verification to debates
|
2015-07-27 18:44:33 +02:00 |
|
Juanjo Bazán
|
2a63d1f953
|
manages permissions for debate editing
|
2015-07-19 14:47:14 +02:00 |
|
rgarcia
|
72bc790310
|
adds tags to debates [#8]
|
2015-07-18 17:24:16 +02:00 |
|
rgarcia
|
45094a86bc
|
adds author to debates [#11]
|
2015-07-18 17:20:30 +02:00 |
|
rgarcia
|
be342cac76
|
Basic CRU operations [#5]
|
2015-07-16 19:22:20 +02:00 |
|