Commit Graph

6458 Commits

Author SHA1 Message Date
Alberto Miedes Garcés
69fc161b83 Show taggings in API 2017-01-26 10:48:05 +01:00
Alberto Miedes Garcés
83267330a7 Group methods related to text generation for GraphQL documentation into a module 2017-01-26 10:47:12 +01:00
kikito
d8b54d2adc fixes question specs 2017-01-25 18:43:30 +01:00
kikito
d9351b123d prints a button to redirect to the poll when a question is answerable 2017-01-25 17:58:09 +01:00
Enrique García
613f16c27b Merge pull request #1367 from consul/poll_answers
Poll answers
2017-01-25 17:34:51 +01:00
Juanjo Bazán
cc6d841978 refactors age calculation 2017-01-25 17:16:17 +01:00
Juanjo Bazán
754095f4d0 fixes modified i18n key 2017-01-25 17:15:38 +01:00
Fernando Blat
08987f7c0c Merge pull request #95 from medialab-prado/69-find-annotation-with-same-ranges
Create a new comment instead of a new annotation with the same ranges
2017-01-25 16:31:51 +01:00
Amaia Castro
53d13d8524 Create a new comment instead of a new annotation with the same ranges 2017-01-25 16:04:10 +01:00
Juanjo Bazán
b13a76963a records participation of user via web
answering a poll question creates a voter with the user data to record
participation in question’s poll
2017-01-25 14:21:03 +01:00
Juanjo Bazán
086f4a4170 refactors Poll::Voter 2017-01-25 14:19:36 +01:00
Juanjo Bazán
5a72e4fbe8 fixes factories method call 2017-01-25 14:18:32 +01:00
Juanjo Bazán
0b2454fb97 adds User#age 2017-01-25 14:17:49 +01:00
Alberto Miedes Garcés
e7f55b10e2 Remove obsolete specs 2017-01-25 13:58:44 +01:00
Alberto Miedes Garcés
e3fca5c49f Remove functionality related to votes demographic info
Since this was giving me too much pain and nobody actually requested
this functionality, I decided to remove it.
2017-01-25 13:37:29 +01:00
Juanjo Bazán
8d8d822323 adds answer spec 2017-01-25 13:04:26 +01:00
Juanjo Bazán
5806d86e33 changes poll_voters to optionally reference an answer
adds indexes for poll_voters
2017-01-25 12:57:00 +01:00
Juanjo Bazán
6bc4f5b307 adds Poll::Answer model for web users
PartialResults is kept for booth results
2017-01-25 12:46:44 +01:00
Juanjo Bazán
8f235c25d3 poll has_many voters 2017-01-25 12:18:15 +01:00
Juanjo Bazán
900563e31c adds poll_id and stats fields to poll_voters 2017-01-25 12:03:48 +01:00
Juanjo Bazán
480f92bdd9 Merge pull request #1366 from consul/polls-geozones
Polls Geozones
2017-01-25 11:31:58 +01:00
kikito
499f9b51e2 makes it possible to create orphan poll questions 2017-01-25 11:19:18 +01:00
Alberto Miedes Garcés
ef6d089022 Refactor GraphqlController 2017-01-25 11:17:08 +01:00
kikito
2be88cb316 Adds missing validation to poll::question. Fixes specs 2017-01-25 10:46:57 +01:00
kikito
25930563e9 adds missing i18n 2017-01-25 10:15:38 +01:00
kikito
e935629fdb i18n 2017-01-24 19:01:28 +01:00
kikito
a4585b00f2 Merge branch 'polls' into polls-geozones 2017-01-24 18:26:23 +01:00
kikito
15b531f068 Fixes failing specs 2017-01-24 18:10:41 +01:00
kikito
6ed73f34b6 Adds activerecord translations 2017-01-24 18:10:30 +01:00
kikito
ddf8d5f811 Removes answerable/non_answerable questions in polls
Now they are either all answerable or non-answerable, so it is not
worth it to make the distinction in code
2017-01-24 18:10:13 +01:00
kikito
6711063c7d Moves geozones from question to poll in user show views 2017-01-24 18:09:27 +01:00
kikito
ab63c18d01 Moves geozones from questions to polls in admin show views 2017-01-24 18:08:48 +01:00
kikito
176a190149 Moves geozones from questions to polls in admin forms 2017-01-24 18:08:15 +01:00
kikito
65b0d27995 Moves geozones from questions to polls in admin controllers 2017-01-24 18:06:41 +01:00
kikito
86b895a7af Adds checkbox toggle js library 2017-01-24 17:51:18 +01:00
Juanjo Bazán
8bd74d2a20 fixes specs
namespace method defined in AdminHelper now returns
X/Y instead of X::Y
2017-01-24 13:07:49 +01:00
Juanjo Bazán
467ca1ba68 Merge branch 'master' into polls 2017-01-24 12:08:59 +01:00
Amaia Castro
b0b65f9853 Hide comments box when showing index 2017-01-23 19:18:13 +01:00
Fernando Blat
7e30c6998b Merge pull request #89 from medialab-prado/66-sync-scroll-in-markdown-editor
Sync scroll in markdown editor
2017-01-23 15:28:30 +01:00
Fernando Blat
c543d1c8d5 Merge branch 'legislation-module-stable' into 66-sync-scroll-in-markdown-editor 2017-01-23 15:08:25 +01:00
Fernando Blat
763f3c28de Merge pull request #93 from medialab-prado/92-hide-legislation-editor
Hide legislation text when the full-screen editor is not active
2017-01-23 15:06:48 +01:00
Fernando Blat
f7a6f8399b Add pending translations 2017-01-23 14:58:12 +01:00
Martín González
deb9d2a508 Fix typo 2017-01-23 14:25:51 +01:00
Martín González
dca072beaf Hide legislation text when the full-screen editor is not active 2017-01-23 12:55:05 +01:00
Martín González
7ce2d2802b Same styles on editor and preview 2017-01-23 12:13:32 +01:00
Fernando Blat
6c2e7fc3b1 Merge pull request #91 from medialab-prado/add-url-helpers-for-legislation-again
Add url helpers for legislation again
2017-01-23 11:18:31 +01:00
Amaia Castro
6e9750bcd8 Merge branch 'legislation-module-stable' into add-url-helpers-for-legislation-again 2017-01-21 21:52:44 +01:00
Amaia Castro
7a55ac1561 Merge branch 'master' into legislation-module-stable 2017-01-21 21:52:17 +01:00
Juanjo Bazán
29f57e7da2 Merge pull request #1365 from medialab-prado/flaky-spec-ballots-hover
Try to avoid intermittent poltergeist error on hover
2017-01-21 19:44:30 +01:00
Amaia Castro
7692fb9cb0 Try to avoid poltergeist error on hover 2017-01-20 19:56:33 +01:00