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 |
|
Amaia Castro
|
151200cc3f
|
Merge pull request #115 from medialab-prado/105-highlight-current-annotation
Fix annotation highlighting for multimode annotation
|
2017-02-13 11:08:47 +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 |
|
Raimond Garcia
|
f413ae72c2
|
Merge pull request #1415 from consul/common-can-answer
cleans common can answer ability
|
2017-02-12 20:00:14 +01:00 |
|
Juanjo Bazán
|
909114bcf5
|
cleans common can answer ability
|
2017-02-12 19:40:08 +01:00 |
|
Raimond Garcia
|
f7c783b019
|
Merge pull request #1414 from consul/indexes
adds polls related indexes and foreign keys
|
2017-02-12 16:57:07 +01:00 |
|
Juanjo Bazán
|
c1997ffca4
|
changes poll recounts/results specs to respect foreign keys
|
2017-02-12 15:57:20 +01:00 |
|
Juanjo Bazán
|
5923d7103c
|
adds polls related indexes and foreign keys
|
2017-02-12 14:59:18 +01:00 |
|
Raimond Garcia
|
5ef860ee5c
|
Merge pull request #1408 from consul/polls-failed-officing-census-calls
Polls failed officing census calls
|
2017-02-12 14:45:01 +01:00 |
|
kikito
|
8ca4cc22b0
|
Adds specs for creating failed officing census calls
|
2017-02-12 14:22:46 +01:00 |
|
kikito
|
871846c070
|
includes :invalid option in officing_residence factory
|
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 |
|
kikito
|
4889dc4527
|
Adds several migrations for new fields related with 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 |
|
Juanjo Bazán
|
dee1b64eb6
|
fixes typo
|
2017-02-10 14:48:49 +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 |
|
Amaia Castro
|
faa6cb90ed
|
Merge pull request #114 from medialab-prado/103-redirect-to-main-phase
Redirect to main phase and activate/deactivate phases
|
2017-02-10 10:45:33 +01:00 |
|
Fernando Blat
|
c81f98c963
|
Change text
|
2017-02-10 09:48:32 +01:00 |
|
Fernando Blat
|
04ad8bb6c7
|
Refactor JS and add update test
|
2017-02-10 09:48:28 +01:00 |
|
Juanjo Bazán
|
331f7cacf3
|
Merge pull request #1411 from consul/polls-admin
Polls admin
|
2017-02-09 20:21:16 +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 |
|
Juanjo Bazán
|
7dc267935e
|
adds field to track former users ids
|
2017-02-09 18:48:26 +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 |
|
Fernando Blat
|
beea28493b
|
Merge pull request #112 from medialab-prado/98-sort-by-votes
Sort comments in sidebar by number of votes
|
2017-02-09 14:40:27 +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 |
|
Raimond Garcia
|
a6047c342c
|
Merge pull request #1410 from consul/polls-polish
Polls polish
|
2017-02-08 22:33:21 +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 |
|
Enrique García
|
09ae95ab77
|
Merge pull request #1409 from consul/user_is_back
logs user info in officer_assignments
|
2017-02-08 16:22:43 +01:00 |
|