Commit Graph

9874 Commits

Author SHA1 Message Date
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
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
María Checa
2629837306 Fixed admin menu active states 2017-09-22 17:25:33 +02:00
María Checa
a870f35de8 Added translations 2017-09-22 17:21:55 +02:00
María Checa
02fa3a83b5 Custom tags for Legislation Process available
Custom tags for Legislation Processes, editable in the admin section.
2017-09-22 17:16:04 +02:00
María Checa
3c4f2426db Removed unnecessary content 2017-09-22 11:39:30 +02:00
María Checa
ebfa3fb011 Disallow users to edit their legislation proposals 2017-09-22 11:39:17 +02:00
iagirre
0948959a65 Run scss-lint to fix some errors in autocomplete_overrides.scss 2017-09-22 08:09:03 +02:00
Carlos Ruiz
dc2e2a0944 Minor refactor and implement foundation toggler 2017-09-21 23:09:04 +02:00
María Checa
f3229007e8 Run pending migrations 2017-09-21 21:28:54 +02:00
María Checa
ac5620c583 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-09-21 21:24:56 +02:00
decabeza
2948251fc2 updates specs 2017-09-21 18:31:30 +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
decabeza
c400c83fa2 removes unnecessary methods on topics helper 2017-09-21 17:41:35 +02:00
decabeza
363f2a59ac improves styles for community 2017-09-21 17:39:55 +02:00
decabeza
0fa59401e4 improves i18n for community 2017-09-21 17:39:32 +02:00
decabeza
c887cb7366 improves html markup on communities and topics views 2017-09-21 17:35:21 +02:00
María Checa
536ee520e8 Removed unnecessary views 2017-09-21 17:13:22 +02:00
María Checa
57c48fe596 Legislation proposals comments working 2017-09-21 17:13:12 +02:00
María Checa
5ae8cda0d5 Fixed legislation proposal vote action 2017-09-21 16:23:34 +02:00
María Checa
6c1c71fcc9 Minor fixes
Fixed subnavigation active links and button to create new proposal.
2017-09-21 16:18:08 +02:00
María Checa
ba041f90c8 Removed unnecessary parts in Legislation Proposals 2017-09-21 16:17:11 +02:00
BertoCQ
7fa21afa56 Merge pull request #1902 from consul/travis-matrix
Build matrix
2017-09-21 15:47:51 +02:00
rgarcia
3ce72b6e40 regenerates knapsack report 2017-09-21 14:42:55 +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
Carlos Ruiz
c9ce560380 Legislation process minor html fixes 2017-09-20 23:34:27 +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
María Checa
38ba5e159b Legislation proposals show and edit views available 2017-09-20 17:45:17 +02:00
Bertocq
6aba5de801 Make rubocop display cop name and style guide link to improve output 2017-09-20 16:13:08 +02:00
Bertocq
c2d154b1ac Comply with Style/PredicateName rule for ? method names 2017-09-20 16:12:28 +02:00
Bertocq
03ee43bfee Use weeks instead of week for more than one 2017-09-20 16:07:53 +02:00
Bertocq
12658e33a9 Use %w string array syntax to comply with the 140 char line limit 2017-09-20 16:07:19 +02:00
BertoCQ
33c687ffec Merge pull request #1878 from deivid-rodriguez/chore/improve_dev_seeds
Minor improvements in dev seeds
2017-09-20 13:27:55 +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
1b3292690a updates spec of admin logo_header 2017-09-20 11:02:13 +02:00
decabeza
5ffac1d1fb remove extra line break 😅 2017-09-20 01:38:32 +02:00
decabeza
3fe1c21d7f includes new css styles 2017-09-20 01:38:32 +02:00
decabeza
3e5b4f2e44 removes important declaration on layout.scss 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