Commit Graph

7804 Commits

Author SHA1 Message Date
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
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
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
a4585b00f2 Merge branch 'polls' into polls-geozones 2017-01-24 18:26:23 +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
Amaia Castro
b0b65f9853 Hide comments box when showing index 2017-01-23 19:18:13 +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
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
kikito
d024505960 moves geozones from poll question to poll in models 2017-01-20 18:58:03 +01:00
Amaia Castro
c4265e76a3 Don’t send notifications when commenting on an annotation
First level comments are considered different threads, so no need to notify the first commenter about other threads
2017-01-20 18:46:57 +01:00
Amaia Castro
289b8e044b Fix url to notifiable when it is a Legislation Question or Annotation 2017-01-20 18:46:57 +01:00
Fernando Blat
7613091d2e Merge pull request #88 from medialab-prado/publish-comment-from-comments-box
Publish comment from comments box
2017-01-20 18:45:38 +01:00
Fernando Blat
63a986d31c If the comment has errors, show the textarea with the error message 2017-01-20 18:35:34 +01:00
Fernando Blat
3d8724b13b Remove unnecessary hidden fields 2017-01-20 18:33:07 +01:00
Fernando Blat
2a5d21f8d4 Focus on textarea when showing the comments box 2017-01-20 18:28:15 +01:00
Fernando Blat
563ca99ab8 Merge pull request #87 from medialab-prado/77-nav-hover
Add hover effect for the main menu
2017-01-20 18:17:56 +01:00
Amaia Castro
b04030b7ff Sync scroll in markdown editor 2017-01-20 12:32:23 +01:00
Martín González
116b211e88 Add hover effect for main process menu 2017-01-20 12:02:50 +01:00
Amaia Castro
78219b5c31 Merge branch 'master' into legislation-module-stable 2017-01-20 11:50:15 +01:00
Amaia Castro
47b35a8149 Add spec for publishing a comment from the comments box for a draft 2017-01-20 11:42:14 +01:00
Juanjo Bazán
bd6514d4a4 Merge branch 'master' into polls 2017-01-20 11:34:12 +01:00
Juanjo Bazán
da2d264f7a adds missing budget_id parameter 2017-01-19 18:30:32 +01:00
Alberto Garcia Cabeza
d30c97c0c2 fixes } scss 2017-01-19 18:04:04 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Amaia Castro
1af047089f Add form to publish a new first level comment from the comments box 2017-01-19 15:42:50 +01:00
Amaia Castro
35d2c54b4e Merge branch 'master' into legislation-module-stable 2017-01-19 12:40:07 +01:00
Amaia Castro
9f7d0b8195 Merge pull request #73 from medialab-prado/legislation-text-index-style
Legislation text index styles
2017-01-19 12:37:30 +01:00
Fernando Blat
e58b382dfa Merge pull request #86 from medialab-prado/fixes-1
A couple of small fixes
2017-01-19 11:19:12 +01:00
Fernando Blat
6970a8f72c Open tree when there's an anchor 2017-01-19 11:15:42 +01:00
Fernando Blat
3bb77b7536 Only open annotations if the anchor is for an annotation 2017-01-19 11:06:41 +01:00
Fernando Blat
6f698ec9a6 Remove console log 2017-01-19 11:03:03 +01:00
Fernando Blat
cba1f8bd9d Draft text index tree navigator 2017-01-19 11:02:45 +01:00
Amaia Castro
536784ee04 Merge pull request #72 from medialab-prado/back-improvements
Back improvements
2017-01-19 10:27:12 +01:00
Martín González
4c5fde956f Add open and closing classes 2017-01-19 10:14:57 +01:00
Martín González
b447ba1fad Basic index styles 2017-01-19 10:14:57 +01:00
Juanjo Bazán
c3635f4182 adds taggables/s path helper 2017-01-18 18:17:02 +01:00
Amaia Castro
fcfb435adb Merge branch 'master' into legislation-module-stable 2017-01-18 17:35:15 +01:00