Commit Graph

2525 Commits

Author SHA1 Message Date
Senén Rodero Rodríguez
534aa4146e Add optional image_url parameter to social sharing partial. 2017-09-26 13:53:42 +02:00
taitus
7b88e63136 Add image to budget investments. 2017-09-26 13:53:42 +02:00
BertoCQ
f2e44f0730 Merge pull request #1919 from consul/chore/remove_booth_assignment_officer_totals
Remove Officer recounts, add Final&Totals votes
2017-09-26 10:19:57 +02:00
BertoCQ
73c47dcd0e Merge pull request #1905 from wairbut-m2c/iagirre-autocomplete-tags
Iagirre autocomplete tags
2017-09-26 10:19:34 +02:00
decabeza
9de8ef2e14 sets data-multi-open to false on admin menu 2017-09-25 19:40:24 +02:00
BertoCQ
0eb33bbcd4 Merge pull request #1910 from consul/filter-subnav
Filter subnav
2017-09-25 19:02:30 +02:00
BertoCQ
a1a74f59bf Merge pull request #1911 from consul/legislation-process
Legislation process SCSS
2017-09-25 19:00:42 +02:00
Bertocq
bf981ca828 Remove Booth Assignment officer totals and add final&system counts 2017-09-25 18:47:44 +02:00
BertoCQ
d449e8ee62 Merge pull request #1875 from consul/admin-design
Admin design
2017-09-25 17:23:17 +02:00
decabeza
e404d149ce fixes some lint errors on legislation_process.scss 2017-09-22 19:10:39 +02:00
decabeza
ad63b0a7d7 makes filter subnav same style than order links 2017-09-22 18:20:21 +02:00
Bertocq
3c2b5281e8 Fix Admin Polls menu active flags 2017-09-22 18:05:53 +02:00
iagirre
c01208b203 Autocomplete tags for investments projects 2017-09-21 18:27:52 +02:00
iagirre
4db2584f87 The tags are suggested based on the entries the user makes.
Cambios para hacer commit:
	modificado:    app/assets/javascripts/tag_autocomplete.js.coffee
	modificado:    app/assets/stylesheets/autocomplete_overrides.scss
	nuevo archivo: app/controllers/tags_controller.rb
	modificado:    app/models/abilities/common.rb
	modificado:    app/views/debates/_form.html.erb
	modificado:    app/views/proposals/_form.html.erb
	modificado:    config/initializers/acts_as_taggable_on.rb
	modificado:    config/routes.rb
	modificado:    spec/lib/acts_as_taggable_on_spec.rb
2017-09-21 18:21:45 +02:00
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
decabeza
80e24d6c13 changes h2 titles upcase to prevent broke specs 2017-09-21 00:58:39 +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
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
decabeza
5ffac1d1fb remove extra line break 😅 2017-09-20 01:38:32 +02:00
decabeza
3e2c639137 moves stats and setting links to header into a partial 2017-09-20 01:38:32 +02:00
decabeza
90f2b84856 improves admin header layout 2017-09-20 01:38:32 +02:00
decabeza
8ed791e860 includes description text on admin dashboard index 2017-09-20 01:38:32 +02:00
decabeza
28a6583199 removes untranslated texts on admin dashboard index 2017-09-20 01:38:32 +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
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
iagirre
049967649e Selection of multiple tags separated by ',' works for hardcoded array of tags. 2017-09-19 17:37:31 +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
adc71faf1c moves author actions to sidebar on proposal show 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
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
a3bf69e78d Remove final result usage on admin poll officer assignments results 2017-09-19 01:13:04 +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
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
Bertocq
20aca263d7 Use correct Predicate name on function 2017-09-15 14:06:20 +02:00
iagirre
4bcb9ba81b Extra indentation spaces erased. 2017-09-15 13:19:58 +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