Commit Graph

7212 Commits

Author SHA1 Message Date
decabeza
c9e8152ead includes lorem content and images to answers 2017-10-04 10:12:54 +02:00
decabeza
cfbc5db9af adds zoom icons and texts 2017-10-04 10:12:54 +02:00
decabeza
639f24e316 adds foundation orbit components and customise them 2017-10-04 10:12:54 +02:00
decabeza
87676f5296 include lorem ipsum content on polls show 2017-10-04 10:12:54 +02:00
decabeza
ad08303dfd removes question link on polls index 2017-10-04 10:12:54 +02:00
decabeza
1b3cdc181d improves polls show layout 2017-10-04 10:12:54 +02:00
Angel Perez
1cc0816dcd Create 'poll_question_answers' controller and views 2017-10-03 23:23:50 -04:00
Angel Perez
1d1b861ddf Create 'poll_question_answers' table 2017-10-03 23:04:50 -04:00
Bertocq
e928eb38ac Add Officer relationship to Poll Voter 2017-10-04 00:39:31 +02:00
María Checa
80c8fa308f Merge branch 'master' into 1954-remove_question_show_and_description 2017-10-03 22:33:08 +02:00
Raimond Garcia
c7f576aa4f Merge pull request #1962 from wairbut-m2c/iagirre-admin-polls-section
Iagirre admin polls section
2017-10-03 22:23:53 +02:00
María Checa
ac1d2e3aec Merge pull request #1960 from consul/polls_minor_changes
Requested polls admin section improvements
2017-10-03 21:36:08 +02:00
María Checa
9871503c5e Restored views 2017-10-03 21:00:40 +02:00
Angel Perez
d9d03079e1 Adapt Poll::Question 'show' action to mockup 2017-10-03 13:29:07 -04:00
María Checa
348e4e54f3 Removed question description 2017-10-03 19:11:54 +02:00
María Checa
5bb831e959 Removed poll question show 2017-10-03 19:11:39 +02:00
Bertocq
45831a0b68 Include last day of poll in range for recount and scrutiny on officing panel 2017-10-03 18:56:27 +02:00
María Checa
05d40c0ede Merge branch 'master' into polls_minor_changes 2017-10-03 16:22:33 +02:00
Pedro
4e7f020d45 Merge pull request #3 from consul/master
Merge final 03/10/17
2017-10-03 14:15:49 +02:00
decabeza
c32a70d2a9 improves css for items on list with images 2017-10-03 13:57:01 +02:00
decabeza
5e9a452e55 removes unnecessary blank space 2017-10-03 13:56:16 +02:00
decabeza
d39c2c6e9e cleans css format 2017-10-03 13:55:59 +02:00
decabeza
894bda92ba moves custom setting to consul settings css 2017-10-03 13:53:57 +02:00
Bertocq
fc5ff61365 Destroy all related OfficerAssignments when destroying a Shift 2017-10-03 12:30:42 +02:00
Bertocq
332b9be94a Reorder before/after create methods 2017-10-03 12:26:43 +02:00
Bertocq
34fbf1472c Join in a single validation both Shift date validates statements 2017-10-03 12:26:04 +02:00
Bertocq
4e85e136d1 Remove OfficerAssignment composed index 2017-10-03 12:02:30 +02:00
Bertocq
ad986e600e Merge branch 'master' into feature/1929#add_shift_task_usage 2017-10-03 12:01:21 +02:00
Bertocq
3a17c74f2c Merge branch 'master' into chore/remove_results 2017-10-03 11:42:57 +02:00
María Checa
e6b5de77fe Removed files that are not being used 2017-10-03 10:50:18 +02:00
María Checa
bf61dffd4b Removed files that are not used 2017-10-03 10:47:48 +02:00
Bertocq
6c998768e8 Fix Poll Recount model spec after default amount value added 2017-10-03 00:19:12 +02:00
BertoCQ
19e8ec265f Merge branch 'master' into chore/remove_results 2017-10-02 23:54:13 +02:00
Bertocq
9ae72387fe Remove remove_question ability from admin on Poll 2017-10-02 23:29:57 +02:00
BertoCQ
fbbbd38932 Merge pull request #1965 from consul/polls-voting
Polls voting
2017-10-02 22:25:51 +02:00
BertoCQ
3835821871 Merge branch 'master' into iagirre-admin-polls-section 2017-10-02 22:25:09 +02:00
BertoCQ
356eb4ca8a Merge pull request #1959 from consul/polls-index
Polls index view
2017-10-02 21:42:59 +02:00
BertoCQ
1b4f6d5cae Merge pull request #1938 from consul/imageable-polish
Imageable polish
2017-10-02 21:42:15 +02:00
BertoCQ
01e4447050 Merge pull request #1923 from wairbut-m2c/iagirre-preview-budget-results
Admins can see the preview of the budgets' results before the balloti…
2017-10-02 21:40:04 +02:00
María Checa
e464985114 Minor fix
Removed unnecessary markdown
2017-10-02 20:34:38 +02:00
Raimond Garcia
a743b6b823 Merge branch 'master' into polls-voting 2017-10-02 17:11:21 +02:00
BertoCQ
7f936f440c Merge branch 'master' into polls_minor_changes 2017-10-02 16:44:53 +02:00
Bertocq
58069b35a3 Remove Poll White/Null/Total Results models, tables, specs and references 2017-10-02 16:24:57 +02:00
rgarcia
085991c624 allows voting only in one origin: booth or web 2017-10-02 16:22:31 +02:00
rgarcia
0147401fbe adds origin to poll voters 2017-10-02 16:18:08 +02:00
Bertocq
b5cf28cb35 Swap Poll White/Null/Total usage for Poll Recount 2017-10-02 15:46:49 +02:00
Bertocq
6c297ae789 Add Poll Recount model, factory and spec 2017-10-02 14:57:40 +02:00
Bertocq
9d7be9b57c Sort Shift recount and scrutiny dates 2017-10-02 13:46:02 +02:00
Bertocq
35f6a5bb65 Add task to unique triple index on Shift for booth, officer and task 2017-10-02 13:45:19 +02:00
rgarcia
60fb142fff adds comprehensive validation specs 2017-10-02 13:39:55 +02:00