Commit Graph

8771 Commits

Author SHA1 Message Date
Senén Rodero Rodríguez
c914c772c0 Add budget investment image dimmensions validator. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
d0a5deab5e Changed class reference for pass lint-scss test. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
ce3193e763 Added style to the button to upload image into budgets/investments/new. Refactor some css into partecipation.scss for pass scss-lint. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
1327b7276d Create investments helper. Fix indentation error and some specs names and structure. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
4469aa9b32 Allow to remove budget investment image from edit image page to authors and administrators. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
943ef06ec8 Use large version of image on budget investment show page 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
31bfe0f974 Removed comment and blank spaces 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
6cde1c1c10 Added upload image button. Created function to show file upload name. Added translation. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
4ce8e14f86 Replaced div with tag 'figure' in budget investment show. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
dd1e73c5fd Add image into investment show and add some change of css. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
0925d33c5b Add dynamic texts to investment image button. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
3d13896c9a Add no image to budget investment’s. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
ce0c0f7024 Allow administrators to edit and update images of any budget investment. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
aa471974bd Use different image versions on responsive sizes 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
51d1031afa Add recomendations to edit image page with english and spanish translations. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
acc79cbe31 Add edit_image and update_image action to budget/investments controller. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
515d6d7e70 Rename image_description column to image_title on budget investments. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
673fc66011 Add budget investements images specs 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
c399692109 Add image description to budget investments 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
00a8f42797 Added image content type validation to only allowing jpg images. 2017-09-26 13:53:42 +02:00
taitus
c5bb6dca65 Add image to budget investments. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
534aa4146e Add optional image_url parameter to social sharing partial. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
4f5a552486 Added image content type validation to only allowing jpg images. 2017-09-26 13:53:42 +02:00
taitus
7b88e63136 Add image to budget investments. 2017-09-26 13:53:42 +02:00
iagirre
e90ac7e72d Admins can see the preview of the budgets' results before the balloting phase is finished.
Cambios para hacer commit:
	modificado:    app/models/abilities/administrator.rb
	modificado:    app/views/budgets/show.html.erb
	modificado:    spec/models/abilities/administrator_spec.rb
	modificado:    spec/models/abilities/everyone_spec.rb
2017-09-26 11:16:32 +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
feddc44267 Merge pull request #1922 from consul/rubocop
Rubocop 🤖  Cleanup
2017-09-26 10:19:47 +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
Bertocq
ee7ef6e2df Normalize some i18n files 2017-09-25 23:02:54 +02:00
Bertocq
7e4d9b749b Fix Style/ColonMethodCall rubocop issues 2017-09-25 22:53:15 +02:00
Bertocq
43758ba830 Fix Style/EmptyCaseCondition rubocop issue 2017-09-25 22:52:38 +02:00
Bertocq
91fcea03b1 Remove useless parentheses on new() call 2017-09-25 22:51:07 +02:00
Bertocq
71b57ffc67 Always use parentheses on method definition 2017-09-25 22:50:24 +02:00
Bertocq
ca35c8b85c Fix Style/NestedParenthesizedCalls rubocop issues 2017-09-25 22:47:59 +02:00
Bertocq
5129fc83a8 Use next to go for next iteration instead than surrounding if 2017-09-25 22:47:03 +02:00
Bertocq
c5059f7292 Fix Style/ParenthesesAroundCondition rubocop issues 2017-09-25 22:46:09 +02:00
Bertocq
22822aa173 Fix Style/RedundantParentheses rubocop issues 2017-09-25 22:44:58 +02:00
Bertocq
2c35cbd27a Remove no longer present Style/StringLiteralsInInterpolation from rubocop todo list 2017-09-25 22:41:05 +02:00
Bertocq
ef038b30ac Remove trailing comma in arguments 2017-09-25 22:30:29 +02:00
BertoCQ
cc7ba7495b Merge pull request #1921 from consul/admin-menu
Admin menu
2017-09-25 19:48:23 +02:00
decabeza
9de8ef2e14 sets data-multi-open to false on admin menu 2017-09-25 19:40:24 +02:00
BertoCQ
e4521e4591 Merge pull request #1920 from consul/admin-notifications
Admin notifications icon
2017-09-25 19:34:08 +02:00
decabeza
7827f6edd1 fixes icon notifications on admin header 2017-09-25 19:17:48 +02:00
BertoCQ
aafd82542e Merge pull request #1894 from consul/chore/rubocop
🤖  Rubocop fixes and config
2017-09-25 19:12:06 +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
iagirre
f7e96067b0 Actions for budgets' headings added. Edit headings, delete headings if not budget investments associated and add link in order to see budgets investments filtered by the heading.
Cambios para hacer commit:
	modificado:    app/controllers/admin/budget_headings_controller.rb
	modificado:    app/models/budget/heading.rb
	nuevo archivo: app/views/admin/budget_headings/_errors.html.erb
	nuevo archivo: app/views/admin/budget_headings/edit.js.erb
	nuevo archivo: app/views/admin/budget_headings/update.js.erb
	modificado:    app/views/admin/budgets/_group.html.erb
	nuevo archivo: app/views/admin/budgets/_heading.html.erb
	nuevo archivo: app/views/admin/budgets/_heading_form.html.erb
	modificado:    config/locales/en/activerecord.yml
	modificado:    config/locales/es/activerecord.yml
	modificado:    spec/features/admin/budgets_spec.rb
	modificado:    spec/models/budget/heading_spec.rb
2017-09-25 15:40:17 +02:00
decabeza
e404d149ce fixes some lint errors on legislation_process.scss 2017-09-22 19:10:39 +02:00