Commit Graph

115 Commits

Author SHA1 Message Date
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
e0c67d8404 adds ancestry column to comments 2015-09-02 17:24:24 +02:00
Juanjo Bazán
916f0bf901 adds spec for Setting 2015-09-01 17:49:01 +02:00
kikito
cb99996317 merges master and fix conflicts 2015-08-28 13:23:30 +02:00
kikito
697d629aab Adds comfirmed_hide_at to users 2015-08-28 10:59:30 +02:00
rgarcia
e3d6331452 adds migrations 2015-08-28 00:02:01 +02:00
kikito
4ab5ab722e hide_reviewed_at -> confirmed_hide_at 2015-08-27 12:23:10 +02:00
kikito
17b33f1030 rename flag_ignored_at to ignored_flag_at in migrations 2015-08-27 11:08:10 +02:00
kikito
a3e983f154 remove unused flagged_as_inappropiate_at column from debates and comments 2015-08-27 10:35:13 +02:00
kikito
b640fcb398 Rename inappropiate_flags_count field to flags_count 2015-08-27 10:18:31 +02:00
kikito
b9dce31a4d Adds migrations for renaming and new flagging field
* inappropiate_flags table becomes flags
* [comments|debates].archived_at becomes flag_ignored_at
* Add new [comments|debates].hide_reviewed_at
2015-08-27 10:11:45 +02:00
Juanjo Bazán
ca3f8daab9 adds comments counte cache column to debate 2015-08-26 17:24:10 +02:00
kikito
4e86586e7d fixes error in db/schema.rb 2015-08-26 14:51:54 +02:00
kikito
25c3c4d1f1 merges master and fix conflicts 2015-08-26 14:48:16 +02:00
kikito
c9ca3877e8 adds only the needed cahced fields to comments and debates; 2015-08-26 14:46:51 +02:00
kikito
6110284356 removes all references to "review" (replaced by "archive") 2015-08-26 13:48:57 +02:00
Juanjo Bazán
96dc85d1a5 adds cache columns to acs_as_votable models 2015-08-25 16:26:36 +02:00
David Gil
f0e47ee787 adds Identity model and migration 2015-08-24 20:24:10 +02:00
Juanjo Bazán
46643185f8 adds administrator_id to comments 2015-08-24 17:22:38 +02:00
kikito
c88f7c1f30 merges master and fixes conflicts 2015-08-23 20:27:11 +02:00
kikito
007ca4afe0 Adds reviewed_at to comments and debates tables 2015-08-21 20:34:56 +02:00
Juanjo Bazán
b396a3b415 refactors user's registration
Simplifies process and fields: 

* In: username
* Out: first_name, last_name, phone, nickname, use_nickname?

Closes #213
2015-08-21 16:41:08 +02:00
kikito
ee881230ba merges master and fixes conflicts 2015-08-20 18:50:10 +02:00
kikito
1458037ee8 adds db migrations for flagging comments & debates as inappropiate 2015-08-20 15:35:47 +02:00
Juanjo Bazán
bd16e9345a adds paranoia to User 2015-08-20 13:16:37 +02:00
kikito
b28f63b016 merges master and fixes conflicts 2015-08-18 09:35:13 +02:00
Juanjo Bazán
7e1cd2940d Fix conflicts 2015-08-17 21:08:15 +02:00
Juanjo Bazán
a13f4920a1 adds Settings 2015-08-17 18:13:30 +02:00
kikito
9e1581656a merges master and fixes conflicts 2015-08-17 17:38:34 +02:00
Juanjo Bazán
e29ae67f31 adds methods to add/remove official position 2015-08-17 15:22:49 +02:00
Juanjo Bazán
f827e860e4 adds official-related fields to User model 2015-08-17 15:22:49 +02:00
rgarcia
f31ed2940d adds moderation to comments and debates [#136] 2015-08-17 13:39:31 +02:00
kikito
8ca546a431 merges master and fixes conflicts 2015-08-17 02:40:11 +02:00
David Gil
0a4aafd8de scaffolds a tag list to mark tags as featured on the admin section 2015-08-15 18:22:29 +02:00
kikito
91804b5f7c replaces organization migrations with a new table 2015-08-13 18:18:49 +02:00
David Gil
19ef481917 adding counter_cache to comments children and WIPing on the issue 2015-08-12 14:58:36 +02:00
kikito
5cef152c37 Adds organization rejection & tests 2015-08-12 13:47:47 +02:00
kikito
3551b55bdd add migration for User organization fields 2015-08-11 18:57:16 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +02:00
Raimond Garcia
16183d9909 Merge pull request #116 from AyuntamientoMadrid/admin-77
Administrator and Moderator basic interface
2015-08-10 16:41:47 +02:00
Alberto Garcia Cabeza
6c0dd32ed1 Adds styles for debates voted and no voted 2015-08-10 12:08:43 +02:00
Eloy Gomez
02f19aa4b1 Add visit_id to debate 2015-08-08 13:09:22 +02:00
Juanjo Bazán
f8becd1b23 Merge branch 'master' into admin-77 2015-08-08 13:00:41 +02:00
Eloy Gomez
42d6e49915 Save visitor ip 2015-08-08 12:23:28 +02:00
Eloy Gomez
aaeb77d969 Add gem ahoy_matey and some dependencies 2015-08-08 12:05:55 +02:00
rgarcia
beb1a796f5 adds email sending preferences [#23] 2015-08-07 20:56:27 +02:00
kikito
3378790764 Adds migrations & models for administrators & moderators 2015-08-07 17:04:50 +02:00
kikito
23a21d14f2 Migration for user.use_nickname 2015-08-06 16:03:54 +02:00
kikito
b848e8d346 migration adding nickname to user 2015-08-06 15:53:31 +02:00