Amaia Castro
|
2efa72ddd5
|
Merge branch 'legislation-module-stable' into 107-social-share-for-annotations
|
2017-02-14 18:14:00 +01:00 |
|
Juanjo Bazán
|
2905c03037
|
Merge pull request #1420 from consul/poll-semi-verified
makes officing residence spec verify users
|
2017-02-14 18:09:34 +01:00 |
|
kikito
|
a8b653739c
|
makes officing residence spec verify users
|
2017-02-14 17:30:22 +01:00 |
|
Martín González
|
af52fb5670
|
Improve social share buttons position for the annotations index and specific annotations
|
2017-02-14 17:11:02 +01:00 |
|
Alberto Garcia Cabeza
|
799bbbe6cb
|
fixes ul close tag on admin polls subnav
|
2017-02-14 16:40:18 +01:00 |
|
Juanjo Bazán
|
e04cc55eb7
|
shows add booth link only for not assigned booths
|
2017-02-14 16:07:34 +01:00 |
|
Juanjo Bazán
|
4beee7bacc
|
improves naming consistency
|
2017-02-14 16:05:28 +01:00 |
|
Juanjo Bazán
|
c359b93fd0
|
fixes booth search in admin
|
2017-02-14 16:01:09 +01:00 |
|
Juanjo Bazán
|
2d722f1ad4
|
redux admin poll subnav
|
2017-02-14 14:57:49 +01:00 |
|
Juanjo Bazán
|
0bd87c7e43
|
extracts results from admin's poll/show
|
2017-02-14 14:26:46 +01:00 |
|
Juanjo Bazán
|
2fae5c3b73
|
makes admin menu aware of recounts
|
2017-02-14 14:08:19 +01:00 |
|
Juanjo Bazán
|
bedb9f29e7
|
extracts recounting from admin's poll/show
|
2017-02-14 14:07:22 +01:00 |
|
Juanjo Bazán
|
19ec7f93b3
|
extracts officer_assignments from admin's poll/show
|
2017-02-14 13:47:33 +01:00 |
|
Juanjo Bazán
|
20e31133a8
|
extracts booth_assignment from admin's poll/show
|
2017-02-14 13:00:19 +01:00 |
|
Fernando Blat
|
9478ca3b60
|
Merge pull request #116 from medialab-prado/106-show-annotation-context
Show annotation context in annotation page
|
2017-02-13 11:42:41 +01:00 |
|
Amaia Castro
|
58b9135c71
|
Add context to annotation in index view
|
2017-02-13 11:18:33 +01:00 |
|
Fernando Blat
|
667d86788e
|
Fix annotation highlighting for multimode annotation
|
2017-02-13 10:12:03 +01:00 |
|
Amaia Castro
|
8e741a6b4f
|
Refactor and use first node start + quote + last node end for the context
|
2017-02-13 09:53:36 +01:00 |
|
Enrique García
|
22d9c17ab4
|
Merge pull request #1417 from consul/admin_main_link
Main link in namespaces
|
2017-02-12 23:04:46 +01:00 |
|
Juanjo Bazán
|
0ae7bac5d5
|
makes main link in namespaces point to correct root_path
|
2017-02-12 22:33:54 +01:00 |
|
Raimond Garcia
|
b7fc8f6883
|
Merge pull request #1416 from consul/fix-duplicities
avoids duplicate entries in officers list
|
2017-02-12 20:26:25 +01:00 |
|
Juanjo Bazán
|
711c2280c6
|
avoids duplicate entries in officers list
|
2017-02-12 20:10:02 +01:00 |
|
Juanjo Bazán
|
909114bcf5
|
cleans common can answer ability
|
2017-02-12 19:40:08 +01:00 |
|
kikito
|
8ca4cc22b0
|
Adds specs for creating failed officing census calls
|
2017-02-12 14:22:46 +01:00 |
|
kikito
|
3b2f2b0fd7
|
Changes models so that officers can make failed census calls
|
2017-02-12 14:22:46 +01:00 |
|
Juanjo Bazán
|
db9ee74828
|
removes max restriction on title length
|
2017-02-12 13:08:26 +01:00 |
|
Amaia Castro
|
6737d6afdd
|
Make annotation context work with multi-node annotations
|
2017-02-10 18:16:09 +01:00 |
|
Amaia Castro
|
4cb1bba5a7
|
Use range offsets instead of quote for substitution
|
2017-02-10 15:55:03 +01:00 |
|
Amaia Castro
|
b298fb7316
|
Show annotation context in annotation page
Only works with quotes within the same html node for now
|
2017-02-10 15:35:42 +01:00 |
|
Enrique García
|
2050962270
|
Merge pull request #1412 from consul/user_is_back
Allow erased verified users to come back
|
2017-02-10 12:10:20 +01:00 |
|
Fernando Blat
|
04ad8bb6c7
|
Refactor JS and add update test
|
2017-02-10 09:48:28 +01:00 |
|
Juanjo Bazán
|
590a7bce44
|
reassigns erased user votes when returning user is verified
|
2017-02-09 20:20:30 +01:00 |
|
Juanjo Bazán
|
35078848c3
|
adds methods to take votes from other user (generic & erased)
|
2017-02-09 20:09:06 +01:00 |
|
Amaia Castro
|
132d5622ca
|
Checkboxes for process dates
|
2017-02-09 19:09:59 +01:00 |
|
Alberto Garcia Cabeza
|
f7971a3c9f
|
improves tables layout on admin polls show views
|
2017-02-09 19:03:06 +01:00 |
|
Alberto Garcia Cabeza
|
ff0013e60c
|
improves table layout on admin poll questions
|
2017-02-09 18:48:06 +01:00 |
|
Juanjo Bazán
|
ae5ba97f1e
|
adds erased scope to User
|
2017-02-09 18:43:50 +01:00 |
|
Alberto Garcia Cabeza
|
b4660e162a
|
improves table layout on admin polls index
|
2017-02-09 18:38:56 +01:00 |
|
Amaia Castro
|
28de717300
|
Show only active phases
|
2017-02-09 17:32:38 +01:00 |
|
Amaia Castro
|
5d37997a69
|
Redirect to allegations phase if open
|
2017-02-09 16:59:02 +01:00 |
|
Amaia Castro
|
d656de680d
|
Social share buttons for annotation
|
2017-02-09 15:32:42 +01:00 |
|
Fernando Blat
|
5d060d6d8c
|
Merge pull request #110 from medialab-prado/101-open-rsponses-only-for-verified-users
Check open phase and user verification for questions open answers
|
2017-02-09 14:45:42 +01:00 |
|
Fernando Blat
|
a22cb764ad
|
Merge pull request #111 from medialab-prado/99-make-process-texts-optional
Make process texts optional
|
2017-02-09 14:43:59 +01:00 |
|
Amaia Castro
|
d65f1998d0
|
Sort comments in sidebar by number of votes
|
2017-02-09 12:42:00 +01:00 |
|
Amaia Castro
|
08ab7474d0
|
Make process texts optional
|
2017-02-09 12:27:16 +01:00 |
|
Alberto Garcia Cabeza
|
0025b7faec
|
adds link to configure poll (poll show) on admin poll index
|
2017-02-08 22:23:17 +01:00 |
|
Alberto Garcia Cabeza
|
086b4108e7
|
improves message of geozone info on poll index
|
2017-02-08 22:19:33 +01:00 |
|
Amaia Castro
|
3009706b0d
|
Don’t allow comments on questions for unverified users and when the phase is closed
|
2017-02-08 18:19:10 +01:00 |
|
Juanjo Bazán
|
d7000e399f
|
logs user info in officer_assignments
In case user is no longer a poll officer, info on who did what is
stored in officer_assignment
|
2017-02-08 15:50:13 +01:00 |
|
Amaia Castro
|
60c7947cb4
|
Merge branch 'master' into legislation-module-stable
|
2017-02-08 12:24:40 +01:00 |
|