BertoCQ
d58d71b98d
Merge pull request #1898 from consul/clean-css
...
Clean CSS
2017-09-21 10:24:03 +02:00
BertoCQ
52954a480e
Merge pull request #1892 from consul/subnavigation
...
Active class on subnavigation
2017-09-21 10:22:45 +02:00
BertoCQ
34568567a3
Merge pull request #1885 from consul/chore/remove_final_recounts
...
Remove Poll Final Recounts, replace with Total Results
2017-09-20 23:00:03 +02:00
decabeza
b43e464292
renames js class
2017-09-20 19:27:11 +02:00
decabeza
6642d47f4c
fixes scss lint errors
2017-09-20 19:26:43 +02:00
decabeza
b291547bae
replaces unnecessary css class
2017-09-20 19:07:08 +02:00
decabeza
3e85961657
fixes duplicated active class on subnavigation
2017-09-20 12:55:34 +02:00
Raimond Garcia
b416d2846e
Merge pull request #1883 from xarlybovi/switch-flags-ajax
...
Switch flag/unflag buttons on use via ajax
2017-09-20 12:21:56 +02:00
BertoCQ
69b7608c74
Merge pull request #1890 from consul/comment-reply-link
...
Comment reply link
2017-09-19 23:41:54 +02:00
BertoCQ
d0528acb85
Merge branch 'master' into aperez-fix-for-issue-1848
2017-09-19 22:54:06 +02:00
decabeza
73b61e8596
adds and removes spaces :neckbeard:
2017-09-19 20:38:08 +02:00
decabeza
1f58dd7545
removes hash comment id on comment replies link
2017-09-19 20:36:57 +02:00
Carlos Ruiz
cf2dff1013
Small class names and html refactor
2017-09-19 20:11:06 +02:00
BertoCQ
f99612d619
Merge pull request #1869 from wairbut-m2c/iagirre-display-datepicker-arrows
...
Iagirre display datepicker arrows
2017-09-19 18:55:10 +02:00
BertoCQ
8cbdc5a6fd
Merge pull request #1874 from wairbut-m2c/iagirre-admin-menu-wrongful-active-items
...
When "Profiles" submenus are selected, the "Site custom" menu doesn't…
2017-09-19 18:52:44 +02:00
BertoCQ
5d6c4f0bbc
Merge pull request #1868 from wairbut-m2c/aperez-validate-poll-question-is-selected
...
Validate presence 'poll_id' attribute on Poll::Question model
2017-09-19 18:15:32 +02:00
decabeza
42749b0389
avoids use class variables on helper
2017-09-19 17:30:40 +02:00
decabeza
fc3eac7e8e
refactors proposal helper and use correctly on proposal show view
2017-09-19 17:30:40 +02:00
decabeza
b5d0a82534
fixes margin of tags on proposal show
2017-09-19 17:30:40 +02:00
decabeza
adc71faf1c
moves author actions to sidebar on proposal show
2017-09-19 17:30:40 +02:00
Bertocq
d9575baaab
Correct end at file ending
2017-09-19 17:30:40 +02:00
Bertocq
c5671ed462
Use correct Predicate name on function
2017-09-19 17:30:40 +02:00
Bertocq
6082147571
Use snake_case for method names
2017-09-19 17:30:40 +02:00
Senén Rodero Rodríguez
6e3f9f9b32
Remove document cached_attachment value after destroy_upload action.
2017-09-19 17:30:40 +02:00
BertoCQ
e4abe0d75a
Merge pull request #1849 from rockandror/documentable-fix
...
Documentable fix
2017-09-19 17:07:25 +02:00
BertoCQ
8c943c5c68
Merge pull request #1876 from consul/chore/rubocop_fixes
...
Manual 🤖 rubocop fixes
2017-09-19 11:22:18 +02:00
Bertocq
630a3252b7
Fix admin poll officers assignments by officer view
2017-09-19 01:38:02 +02:00
Bertocq
2e3b5aad49
Totally remove Poll::FinalRecount model, table spec and factory
2017-09-19 01:22:30 +02:00
Bertocq
a3bf69e78d
Remove final result usage on admin poll officer assignments results
2017-09-19 01:13:04 +02:00
Bertocq
1c1bb7bf38
Remove no longer used functions
2017-09-19 01:12:24 +02:00
Bertocq
851d397395
Replace FinalResult with TotalResult at admin Poll Recounts page
2017-09-19 00:54:46 +02:00
Bertocq
f27fcc7f99
Replace FinalResult with TotalResult at admin BoothAssignment show
2017-09-19 00:45:13 +02:00
Carlos Ruiz
12d34a3ea1
Switch flag/unflag buttons on use via ajax
2017-09-18 19:07:45 +02:00
decabeza
4ce06fac4e
avoids use class variables on helper
2017-09-18 17:52:36 +02:00
decabeza
1c6a873b6d
refactors proposal helper and use correctly on proposal show view
2017-09-18 17:31:37 +02:00
decabeza
cacd99648e
fixes margin of tags on proposal show
2017-09-18 14:22:02 +02:00
decabeza
2b3cbac5bc
moves author actions to sidebar on proposal show
2017-09-18 14:21:38 +02:00
BertoCQ
8cae97d98d
Merge pull request #1853 from wairbut-m2c/mlucena-admin-menu
...
20170912 - Disabled user questions for polls into budgets view.
2017-09-18 10:11:31 +02:00
iagirre
b889d23fe6
Fixed width property, changed to top.
2017-09-18 08:19:47 +02:00
Bertocq
485b94eab9
Correct end at file ending
2017-09-15 14:06:26 +02:00
Bertocq
20aca263d7
Use correct Predicate name on function
2017-09-15 14:06:20 +02:00
Bertocq
a3428ee589
Use snake_case for method names
2017-09-15 14:06:17 +02:00
BertoCQ
87eeefff41
Merge pull request #1867 from consul/chore/rubocop_autocorrections
...
🤖 Rubocop autocorrections
2017-09-15 14:04:01 +02:00
iagirre
4bcb9ba81b
Extra indentation spaces erased.
2017-09-15 13:19:58 +02:00
Bertocq
7be1f0315e
Update Officing Polls final condition up to 2 weeks after poll ending
2017-09-15 12:37:42 +02:00
iagirre
d629aef3b9
When "Profiles" submenus are selected, the "Site custom" menu doesn't open. Moreover, when "Site custom" submenus are selected, the menu remains opened.
2017-09-15 12:33:31 +02:00
Manuel Lucena
e93ac4e570
20170915 - fixed additional spacing and implemented suggested change of controller conditions
2017-09-15 11:10:48 +02:00
Manuel Lucena
823031af31
20170915 - Fixed behavior for sub menus under legislation section
...
On branch mlucena-admin-menu
Changes to be committed:
modified: app/views/admin/_menu.html.erb
2017-09-15 10:59:58 +02:00
iagirre
5ca4a6052f
Merge branch 'iagirre-display-datepicker-arrows' of github.com:wairbut-m2c/consul into iagirre-display-datepicker-arrows
2017-09-15 10:04:12 +02:00
iagirre
354d07c1a6
Changes suggested in the PR https://github.com/consul/consul/pull/1869 made. Use the icons of consul instead of icons from jquery-ui.
...
Cambios para hacer commit:
modificado: app/assets/stylesheets/application.scss
modificado: app/assets/stylesheets/datepicker_overrides.scss
borrado: app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb
2017-09-15 10:02:18 +02:00
