Commit Graph

6458 Commits

Author SHA1 Message Date
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
Fernando Blat
5cd263b79c In mobile, don't load comments in the sidebar, but use the permalink page 2017-02-06 13:15:37 +01:00
Fernando Blat
ea33dce3a6 Allow 5 levels of highlighting 2017-02-06 12:59:57 +01:00
Fernando Blat
ee90bca24d Highlight current annotation 2017-02-06 12:57:30 +01:00
Fernando Blat
09b14d9687 Annotation pointer cursor 2017-02-06 12:54:07 +01:00
Juanjo Bazán
4c27d4ee82 Merge pull request #1398 from consul/polish-polls
polish polls
2017-02-06 12:11:31 +01:00
Alberto Garcia Cabeza
26ac9f6759 makes buttons 100% width on mobile version 2017-02-06 12:04:50 +01:00
Alberto Garcia Cabeza
1d2a0c3fcd moves date info, makes polls title bigger 2017-02-06 12:04:31 +01:00
Raimond Garcia
7857dcf79c Merge pull request #1396 from consul/blanks_and_nulls
Blanks and nulls final results by poll officers
2017-02-03 20:23:27 +01:00
Juanjo Bazán
2a902c68eb adds creation of null and white results by poll officers 2017-02-03 19:11:04 +01:00
Juanjo Bazán
c9c4b30ffc adds Null/White Results models 2017-02-03 19:08:40 +01:00
Raimond Garcia
34bb7df8b1 Merge pull request #1394 from consul/polls-index
polls index
2017-02-03 18:33:30 +01:00
Juanjo Bazán
e44349d1c1 adds poll_white_results and poll_blank_results 2017-02-03 18:12:32 +01:00
Alberto Garcia Cabeza
46d9961c36 adds icon if already answer poll 2017-02-03 17:43:44 +01:00