Commit Graph

434 Commits

Author SHA1 Message Date
Julian Herrero
8ef9e69f71 Update from upstream 2016-01-10 15:26:19 +01:00
Julian Herrero
bf302be879 add frendly urls for debates and proposals 2016-01-08 17:24:49 +01:00
Juanjo Bazán
307b29736d Merge branch 'master' into notifications 2016-01-08 15:07:16 +01:00
Juanjo Bazán
432e9e0d5b adds counter cache for user's notifications 2016-01-08 14:39:34 +01:00
Juanjo Bazán
704a038795 groups notifications 2016-01-08 14:32:16 +01:00
Juanjo Bazán
790d8de5b6 removes unused method 2016-01-08 13:06:00 +01:00
rgarcia
816a95b7b7 adds comment show view 2016-01-07 15:18:28 +01:00
rgarcia
e2f419e625 destroy notifications when marked as read 2016-01-07 12:02:01 +01:00
rgarcia
b5e9113718 merges activities into notifications 2016-01-06 12:33:37 +01:00
Julian Herrero
9a5f525dc9 marcar notificaciones como leidas despues de ser vistas 2016-01-05 17:43:44 +01:00
Julian Herrero
d9ba3edc2a mostrar notificaciones a los usuarios cuando alguien comenta en su
debate o responde a su comentario
2016-01-05 17:43:44 +01:00
Julian Herrero
ba0ce4e14b añadir track_activity para mostrar futuras notificaciones a los usuarios 2016-01-05 17:42:10 +01:00
kikito
756c07c180 hides the admin checkboxes in annotator when editing an existing annotation 2015-12-18 16:31:30 +01:00
kikito
60e78e58fa Rename ability 2015-12-16 18:44:27 +01:00
kikito
cf04b48d4e Allow anyone to search and read annotations 2015-12-16 18:10:17 +01:00
kikito
c98360fa87 Return a permissions hash with all the annotations 2015-12-16 18:10:02 +01:00
kikito
fc8a1fc84b allows not-logged-in users to read existing annotations 2015-12-16 16:26:59 +01:00
rgarcia
60d6f1c41b annotates legislations instead of proposals 2015-12-16 11:45:47 +01:00
rgarcia
9c3fda076d adds legislation permissions 2015-12-16 11:45:47 +01:00
rgarcia
996e87cb13 adds legislations 2015-12-16 11:45:46 +01:00
Abigail Sosa
bb5da1af7f Se agrega usuario autor a cada anotacion 2015-12-16 11:45:46 +01:00
Abigail Sosa
189a6426b1 Se agregan anotaciones a propuestas existentes 2015-12-16 11:45:46 +01:00
Jakub
e4b31cfe29 Move automatic official_level assignment to the controller. 2015-12-01 23:18:23 +01:00
Jakub
ea9a2b3be6 Better names for the official email methods 2015-11-30 21:52:48 +01:00
Jakub
da490a4661 Officials level 1 is auto-assigned on email confirmation. Settings option is now optional. Also working on subdomains 2015-11-30 20:48:12 +01:00
Jakub
b4be4259b7 Level 1 officials are now auto-assigned. Rake user:check_email_domains created. 2015-11-29 00:55:15 +01:00
rgarcia
3f68c6726a maintains responsible name when user is erased 2015-11-23 19:12:57 +01:00
rgarcia
44f2b49647 adds consistency between debates and proposals 2015-11-23 13:40:31 +01:00
rgarcia
a44242b82a orders results after search 2015-11-23 13:40:05 +01:00
rgarcia
1429728368 improves search order 2015-11-18 21:30:12 +01:00
rgarcia
c212aa3afd fixes specs 2015-11-18 21:04:16 +01:00
rgarcia
8b22c59bec removes trigram search algorithm 2015-11-18 20:04:19 +01:00
rgarcia
f63500b0c8 breaks down method into smaller ones 2015-11-18 17:57:57 +01:00
rgarcia
8188b29e10 adds consistent indentation to hash 2015-11-18 17:57:57 +01:00
kikito
c7bf31c588 Make search cache order aware & accept values instead of column names 2015-11-18 17:57:57 +01:00
rgarcia
1de91658c7 extracts cached tsvector to concern 2015-11-18 17:57:56 +01:00
rgarcia
fa83e196ca adds tags to tsvector 2015-11-18 17:57:56 +01:00
rgarcia
25184666a5 uses tsvector column to search 2015-11-18 17:57:56 +01:00
Juanjo Bazán
c258a4f3b4 adds scope for only normal user comments 2015-11-12 12:15:36 +01:00
Juanjo Bazán
7f1fe034a3 adds user's public show page 2015-11-03 19:29:35 +01:00
kikito
73c306a673 Adds 3 orders for comments: most_voted, newest, oldest 2015-11-02 14:01:55 +01:00
kikito
2fab210ac8 merges with master and fixes conflicts 2015-10-31 17:09:52 +01:00
rgarcia
ebf44c8777 temporarily using old search for debates 2015-10-30 21:54:15 +01:00
rgarcia
9132406569 bringing back standard pg_search configuration for debates 2015-10-30 21:53:58 +01:00
rgarcia
640bea39c5 removes tsearch for debates 2015-10-30 21:35:16 +01:00
rgarcia
3eb9fb41aa increasing trigram threshold for debates 2015-10-30 21:32:16 +01:00
rgarcia
57b9266675 removes dictionary from debate search 2015-10-30 21:24:46 +01:00
kikito
0cf592af71 Fixes two issues in comment_tree
* The descendants list for a comment was not being built correctly
* The root comments must be ordered “newest first”, but their
descendants must be ordered “newest last”
2015-10-30 20:06:36 +01:00
rgarcia
f523205586 includes physical votes in score calculations 2015-10-30 19:26:45 +01:00
rgarcia
5223ec664c adds physical_votes to vote counter 2015-10-30 19:26:25 +01:00