consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,875 Commits 1 Branch 0 Tags
f7e96067b094375daf5aea533112ad42025231be
Commit Graph

6875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
BertoCQ
69b7608c74 Merge pull request #1890 from consul/comment-reply-link 
Comment reply link
 2017-09-19 23:41:54 +02:00
BertoCQ
9b0732b8d9 Merge pull request #1863 from wairbut-m2c/aperez-fix-for-issue-1848 
Add base controller for Admin:Poll controller
 2017-09-19 22:54:14 +02:00
BertoCQ
d0528acb85 Merge branch 'master' into aperez-fix-for-issue-1848 2017-09-19 22:54:06 +02:00
David Rodríguez
69aaa7de12 Fixes unintended new line 2017-09-19 22:01:47 +02:00
David Rodríguez
e2c311a624 Adds an unverified user to dev seeds 
Useful if you want to test the verification process.
 2017-09-19 22:01:47 +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
61c9536697 Add flagging/unflagging rspec 2017-09-19 20:11:23 +02:00
Carlos Ruiz
cf2dff1013 Small class names and html refactor 2017-09-19 20:11:06 +02:00
BertoCQ
033df1192f Merge pull request #1889 from consul/dev_seeds 
Fixes dev seeds
 2017-09-19 19:46:47 +02:00
rgarcia
37be890fbe Fixes dev seeds 
Poll::Questions now have a validation for a `poll_id`
 2017-09-19 19:39:47 +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
9c6a974bec Fix wrong spectations after final result swap for total result 2017-09-19 18:54:37 +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
rgarcia
3105bd9ee1 precompile assets in test environment 
Usually the first spec that visits a page fails with a timeout.
Hopefully it was due to having to compile assets at runtime and this helps to fix it
 2017-09-19 17:30:40 +02:00
rgarcia
882723a58a fixes flaky spec 
Adds random number to the proposal’s title, to avoid js popup
displaying similar proposals
 2017-09-19 17:30:40 +02:00
rgarcia
6de47e7f1d fixes flaky spec 
Maybe using `build` instead of `create` was confusing the spec
 2017-09-19 17:30:40 +02:00
rgarcia
92333e530f fixes flaky spec 
Visits directly the page to avoid flakiness
 2017-09-19 17:30:40 +02:00
rgarcia
aee34e643c removes unused expectation 2017-09-19 17:30:40 +02:00
rgarcia
d1aa01b9fa fixes flaky spec 
Using correct resource in path
 2017-09-19 17:30:40 +02:00
rgarcia
c128a0f21d removes obsolete legislations specs 
Obsolete and flaky!
 2017-09-19 17:30:40 +02:00
rgarcia
8db8049e49 fixes flaky spec 
Reactivates feature setting after spec
 2017-09-19 17:30:40 +02:00
Bertocq
c1543c777d Remove Netbeans folder from .gitignore 
Why:

* IDE/Text editor specific files and folders to be ignored should be on each developer's personal .gitignore_global file

How:

* If you're affected by this change, check https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
 2017-09-19 17:30:40 +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
bf37b8e5f9 Use datetime always with zone 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
5cf862064d Merge pull request #1888 from consul/flaky-specs 
Fixes some flaky specs
 2017-09-19 16:43:41 +02:00
rgarcia
33ba7821d5 precompile assets in test environment 
Usually the first spec that visits a page fails with a timeout.
Hopefully it was due to having to compile assets at runtime and this helps to fix it
 2017-09-19 15:14:55 +02:00
rgarcia
3b76c7428b fixes flaky spec 
Adds random number to the proposal’s title, to avoid js popup
displaying similar proposals
 2017-09-19 15:14:29 +02:00
rgarcia
0de87c19c6 fixes flaky spec 
Maybe using `build` instead of `create` was confusing the spec
 2017-09-19 15:14:29 +02:00