kikito
|
183f8432eb
|
Merge branch 'polls' into polls-question-show
|
2017-01-26 11:36:34 +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 |
|
Juanjo Bazán
|
cc6d841978
|
refactors age calculation
|
2017-01-25 17:16:17 +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
|
0b2454fb97
|
adds User#age
|
2017-01-25 14:17:49 +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 |
|
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 |
|
kikito
|
d024505960
|
moves geozones from poll question to poll in models
|
2017-01-20 18:58:03 +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 |
|
Juanjo Bazán
|
c3635f4182
|
adds taggables/s path helper
|
2017-01-18 18:17:02 +01:00 |
|
Alberto Garcia Cabeza
|
750909916b
|
improves layout on sign in and sign up views
|
2017-01-17 19:13:31 +01:00 |
|
Alberto Garcia Cabeza
|
72ab4f5923
|
fixes styles on callout warning
|
2017-01-17 19:09:46 +01:00 |
|
Alberto Garcia Cabeza
|
86360a8719
|
shows fixed bar only in correct heading on voting phase
|
2017-01-17 18:59:12 +01:00 |
|
Alberto Garcia Cabeza
|
c5c686ec74
|
adds progress bar styles
|
2017-01-17 18:58:32 +01:00 |
|
Alberto Garcia Cabeza
|
d890b0a98b
|
adds fixed bar js
|
2017-01-17 18:58:13 +01:00 |
|
Alberto Garcia Cabeza
|
2aaf917510
|
adds different back link if headings count equal to 1
|
2017-01-17 18:16:50 +01:00 |
|
Juanjo Bazán
|
f6989bbb55
|
Merge pull request #1358 from consul/budget-unfeasibles
Budget unfeasibles
|
2017-01-17 13:43:48 +01:00 |
|
Juanjo Bazán
|
68fc922fda
|
autolinks budget description
|
2017-01-17 13:07:07 +01:00 |
|
Alberto Garcia Cabeza
|
56694debfd
|
removes duplicated social buttons on investment show
|
2017-01-16 18:49:19 +01:00 |
|
Alberto Garcia Cabeza
|
45450d74ff
|
improves styles for unfeasible investments
|
2017-01-16 18:45:42 +01:00 |
|
Alberto
|
868ed78488
|
Merge pull request #1348 from aspgems/custom_settings_scss
Add custom setting for foundation variables.
|
2017-01-16 17:58:05 +01:00 |
|
rgarcia
|
5f7269a070
|
displays unfeasible budgets link from home
|
2017-01-16 03:09:08 +01:00 |
|
rgarcia
|
fa9cb00c65
|
displays appropriate permission messages in accepting phase
|
2017-01-15 20:37:44 +01:00 |
|
Raimond Garcia
|
69c043a886
|
Merge pull request #1356 from consul/budget-emails
Budget emails
|
2017-01-15 19:15:39 +01:00 |
|
rgarcia
|
0f1a98da7d
|
fixes conflicts with master
|
2017-01-15 19:04:12 +01:00 |
|
rgarcia
|
537de8c46c
|
Merge branch 'master' into budget-emails
|
2017-01-15 18:58:20 +01:00 |
|
Alberto Garcia Cabeza
|
1de39edf92
|
adds styles and i18n for mailer budget investment created
|
2017-01-15 13:52:09 +01:00 |
|
Alberto Garcia Cabeza
|
61450cb48f
|
adds social share buttons on investments show
|
2017-01-15 13:51:45 +01:00 |
|
rgarcia
|
289666bb4d
|
loads tag cloud in balloting phase
|
2017-01-15 12:08:41 +01:00 |
|
rgarcia
|
938ba40306
|
loads categories in sidebar for balloting phase
|
2017-01-15 12:06:38 +01:00 |
|
rgarcia
|
42604e27b9
|
Displays tag cloud in all phases
|
2017-01-15 09:55:01 +01:00 |
|
rgarcia
|
68bf119c18
|
sends unfeasible budget investment
|
2017-01-14 17:02:33 +01:00 |
|
rgarcia
|
82322ee233
|
sends budget investment created email
|
2017-01-14 16:10:43 +01:00 |
|
Raimond Garcia
|
7f88100599
|
Merge pull request #1352 from consul/feasibility_link
Feasibility index
|
2017-01-14 12:36:26 +01:00 |
|
Juanjo Bazán
|
36140e0ce3
|
adds link to unfeasible investments to index page
|
2017-01-14 11:33:49 +01:00 |
|