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 |
|
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 |
|
Amaia Castro
|
32dc39860c
|
Merge pull request #109 from medialab-prado/annotation-improvements
Annotation improvements
|
2017-02-08 12:17:33 +01:00 |
|
Juanjo Bazán
|
cb75be8f6a
|
Merge branch 'master' into polls
|
2017-02-08 11:25:20 +01:00 |
|
Raimond Garcia
|
73f4cf11b6
|
Merge pull request #1407 from consul/polls-officing-residence
Polls officing residence
|
2017-02-07 21:00:17 +01:00 |
|
Alberto Garcia Cabeza
|
9a03507a0c
|
adds autocomplete off and type number on officing residence form
|
2017-02-07 20:11:55 +01:00 |
|
Raimond Garcia
|
5a20a4d190
|
Merge pull request #1406 from consul/quoting
avoids error 500 if invalid random_seed
|
2017-02-07 19:40:50 +01:00 |
|
Juanjo Bazán
|
ba0b39a45c
|
avoids error 500 if invalid random_seed
|
2017-02-07 19:29:17 +01:00 |
|
Enrique García
|
11736f742b
|
Merge pull request #1405 from consul/quoting
quotes random seed
|
2017-02-07 19:13:47 +01:00 |
|
Juanjo Bazán
|
e93461356c
|
quotes random seed
|
2017-02-07 19:05:04 +01:00 |
|
Juanjo Bazán
|
81d8baa45f
|
Merge pull request #1404 from consul/polls-officing-age-error
makes age errors visible
|
2017-02-07 17:35:10 +01:00 |
|
kikito
|
c473f9856f
|
makes age errors visible
|
2017-02-07 16:48:19 +01:00 |
|
Juanjo Bazán
|
7abb741fc6
|
Merge pull request #1403 from consul/polls-questions-author-visible-name
uses Poll::Question#author_visible_name in question/show
|
2017-02-07 12:19:59 +01:00 |
|
kikito
|
e6fd615adf
|
uses Poll::Question#author_visible_name in question/show
|
2017-02-07 12:09:19 +01:00 |
|
Juanjo Bazán
|
2917edabc1
|
Merge pull request #1402 from consul/polls-show
polls show
|
2017-02-07 11:08:23 +01:00 |
|
Alberto Garcia Cabeza
|
ec729ee1e1
|
removes total question count text on polls show
|
2017-02-07 10:46:46 +01:00 |
|
Raimond Garcia
|
6c93b8ced5
|
Merge pull request #1401 from consul/polls-show-share
polls show share
|
2017-02-06 20:49:57 +01:00 |
|
Alberto Garcia Cabeza
|
d19c3af21a
|
adds social share on polls show view
|
2017-02-06 19:17:50 +01:00 |
|
Enrique García
|
6e36e44614
|
Merge pull request #1400 from consul/results-admin
Poll Results for Admin
|
2017-02-06 19:10:48 +01:00 |
|
Juanjo Bazán
|
35540cdcf1
|
adds poll results to admin
simple page shows results by question, white and null results
|
2017-02-06 17:12:54 +01:00 |
|
Juanjo Bazán
|
d51a3507a1
|
corrects i18n value
|
2017-02-06 17:01:06 +01:00 |
|