Commit Graph

226 Commits

Author SHA1 Message Date
Juanjo Bazán
136c1e73ed uses ancestry to retrieve debate comments 2015-09-03 16:32:54 +02:00
Enrique García
aa22c82a5c Merge pull request #331 from AyuntamientoMadrid/letter_verification
Letter verification
2015-09-03 12:38:08 +02:00
Juanjo Bazán
572432f2cf Merge pull request #339 from AyuntamientoMadrid/remove-tag-filter-337
Remove tag filter
2015-09-03 11:50:53 +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
rgarcia
4897d5df4e makes spaces consistent 2015-09-03 01:29:46 +02:00
rgarcia
29ae0c68f8 removes unnecessary comments 2015-09-03 01:29:13 +02:00
rgarcia
99d779bcec adds letter code verification 2015-09-02 21:57:03 +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
274ddb2589 changes rules for allowing debate votes
first 100 votes are allowed for unverified users
2015-09-02 13:40:38 +02:00
Raimond Garcia
3974ee1870 Merge pull request #315 from AyuntamientoMadrid/dev-seed
rake db:dev_seed
2015-09-01 21:12:19 +02:00
kikito
62415991c0 Fixes an issue found on comments using the dev_seed 2015-09-01 20:11:45 +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
Juanjo Bazán
0dca4c277b adds Setting validation 2015-09-01 17:49:01 +02:00
Juanjo Bazán
2e5b5bccb5 adds methods to decide if a user can vote a debate 2015-09-01 17:49:01 +02:00
kikito
d0c7c7fe79 Adds User.comment_flags 2015-09-01 13:09:35 +02:00
kikito
c2faf0ef92 Merge Vote.in with Vote.for_debates 2015-09-01 13:08:32 +02:00
kikito
6902d2851b Takes already-flagged-content out of Ability's concerns 2015-09-01 10:33:11 +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
rgarcia
9abd794133 validates acceptance of census terms of service 2015-08-30 12:50:17 +02:00
Juanjo Bazán
43b333b844 admins can search officials by name or email 2015-08-29 17:02:21 +02:00
Juanjo Bazán
59c2fdb596 adds search method to Organization 2015-08-29 16:29:55 +02:00
Juanjo Bazán
e8463d1372 moves Residence model to Verification namespace 2015-08-29 12:38:07 +02:00
Juanjo Bazán
e33723635b moves Email model to Verification namespace 2015-08-29 12:26:20 +02:00
Juanjo Bazán
e6fd62189b moves Sms model to Verification namespace 2015-08-29 12:17:27 +02:00
Juanjo Bazán
50dcbcdf9b moves Letter to Verification namespace 2015-08-29 12:07:43 +02:00
Jose Manuel
ef1f89ab84 Merge branch 'refactored_moderator' into master 2015-08-29 02:15:26 +01:00
Jose Manuel
e21336aeff Refactored admin´s moderator controller 2015-08-29 01:39:46 +01:00
kikito
b872d9a46d fixes failing specs 2015-08-28 19:19:18 +02:00
kikito
ffad7fbc86 Rename UserApi to CensusApi. Fixes #271 2015-08-28 15:38:22 +02:00
kikito
3720551e78 fixes badly done merge 2015-08-28 13:41:51 +02:00
kikito
cb99996317 merges master and fix conflicts 2015-08-28 13:23:30 +02:00
kikito
9328e1401f Adds user admin capabilities and missing i18n entries 2015-08-28 12:00:18 +02:00
kikito
a5e48693fe Implements admin interface for Comments incl. filters 2015-08-28 10:56:43 +02:00
rgarcia
974d004bc4 fixes ambiguous db query 2015-08-28 00:01:26 +02:00
rgarcia
e83b423fd4 adds user verification extensions 2015-08-27 23:59:47 +02:00
rgarcia
f7d22f64b6 adds letter verification 2015-08-27 23:58:31 +02:00
rgarcia
570f67195c adds email verification 2015-08-27 23:57:04 +02:00
rgarcia
3fc8d830f1 adds verified users concept 2015-08-27 23:56:10 +02:00
rgarcia
671399bb89 adds sms verification 2015-08-27 23:54:57 +02:00
rgarcia
07180bcd04 adds residence verification 2015-08-27 23:53:49 +02:00
kikito
76c2f2f021 Merge branch 'master' into flag-renaming 2015-08-27 19:06:29 +02:00
kikito
fb9d3097cc Finishes admin interface for debates 2015-08-27 19:05:27 +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
1770dfd3f6 adds ability to confirm the hiding of comments, debates or users 2015-08-27 13:20:12 +02:00
kikito
cd982768f2 Renames the "archive" action to "ignore_flag" (+)
* archived_at -> ignored_flag_at
* archived? -> ignored_flag?
* archive -> ignore_flag
* pending -> pending_flag_review
* archived (scope) -> with_ignored_flag
* I18n changes
2015-08-27 11:43:58 +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