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

3826 Commits

Author SHA1 Message Date
Bertocq
339597483e Add incompatible scope to Budget Investment model 2017-07-04 01:34:25 +02:00
Bertocq
688ec05ea2 Replace winner column for incompatible on admin investment list filter by selected 2017-07-04 01:34:24 +02:00
Bertocq
646b3657ee Add investment status on admin budget investment detail show page 2017-07-04 01:34:24 +02:00
Bertocq
afc77f68fb Add incompatible checkbox on admin investment edit form 2017-07-04 01:34:24 +02:00
Bertocq
99052485fb Recalculate heading winner investments when a winner is flagged as incompatible 2017-07-04 01:34:24 +02:00
Bertocq
640e0e1c2a Use compatible filter when calculating budget heading winners 2017-07-04 01:34:24 +02:00
Bertocq
ed016d7afd Add compatible scope to Budget Investment and use it on the winners scope 
Why:

* Only compatible investments can be winners

How:

* Using the new column incompatible to filter compatible investments
 2017-07-04 01:34:24 +02:00
Eduardo Martinez Echevarria
9324b02ce1 Avoid set_process on legislation/processes controller member actions 2017-07-01 12:39:16 +02:00
Bertocq
d31e0ed79b Bring set_process back to legislation process controller, still needed until is correctly loaded 2017-07-01 02:05:57 +02:00
Eduardo Martinez Echevarria
a599a0b91e Set legislation processes visibility depending on publication 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
3e5c5d7e49 Define some actions on legislation processes as member actions 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
dfa9c988ad Add checkbox to set published in process admin management 2017-06-30 15:08:23 +02:00
Raimond Garcia
22d28d9c79 Merge branch 'master' into issue#1575-tag-administration 2017-06-29 19:09:54 +02:00
Raimond Garcia
f24256c13f Merge pull request #1711 from consul/annotation-legislation 
Annotation on legislation
 2017-06-29 13:33:03 +02:00
decabeza
fe069b6be9 changes hex to hsla colors 2017-06-28 16:33:02 +02:00
Bertocq
c4ba35bf63 Revert rubocop autocorrections and add it to exclusion list on rubocop_todo file 2017-06-28 14:33:34 +02:00
Bertocq
904e3fdcfa Fix all Style/HashSyntax rubocop issues and remove from rubocop_todo list 2017-06-28 14:12:51 +02:00
Bertocq
c9bc028524 Remove all unnecesary extra spacing and Layout/ExtraSpacing list from rubocop file 2017-06-28 14:12:51 +02:00
Bertocq
775da2d581 Remove all Layout/EmptyLines issues on code and file list from rubocop_todo 2017-06-28 14:12:51 +02:00
Bertocq
2fa92937d2 Fix all Style/BracesAroundHashParameters rubocop issues and remove them from rubocop_todo list 2017-06-28 14:12:51 +02:00
decabeza
ef1a416b50 improves color palette for annotation weights 2017-06-28 13:40:44 +02:00
decabeza
a97130934a fixes text on publish comment button 2017-06-28 13:40:37 +02:00
Bertocq
57f476c2fa Merge branch 'master' into feature/add_population_to_budget_heading 2017-06-27 18:43:24 +02:00
Raimond Garcia
db43b4876c Merge pull request #1701 from consul/chore/rubocop_todo_cleanup 
Rubocop todo list cleanup: The Space Party 🚀
 2017-06-27 15:27:17 +02:00
Raimond Garcia
2ad4959c42 Merge pull request #1706 from consul/refactor_test 
Refactor comments partial
 2017-06-27 15:25:41 +02:00
decabeza
af7807ce9f Updates custom note class to foundation help-text 2017-06-27 10:29:36 +02:00
Bertocq
295f2bc32b Remove no longer needed specific budget investments comments partial 2017-06-26 19:26:30 +02:00
Bertocq
79ecc5cfca Use comments comment_tree partial without comments count display investments show page 2017-06-26 19:24:33 +02:00
Bertocq
6c386ffd95 Make comments count display optional using a variable on comments comment_tree partial 2017-06-26 19:23:49 +02:00
Bertocq
ce7a67418b Remove current_order variable assignament, only used once 2017-06-26 18:50:28 +02:00
Juanjo Bazán
14e74ab6a9 Merge pull request #1702 from consul/suggest 
updates very old foundation class 👴🏻
 2017-06-26 18:11:43 +02:00
decabeza
c2b129bc00 updates very old foundation class 👴🏻 2017-06-26 18:06:27 +02:00
Bertocq
1c8e039862 Fix all Layout/SpaceInsideParens rubocop issues and remove files from rubocop_todo list 2017-06-26 18:06:01 +02:00
Bertocq
c4d90691b1 Fix all Layout/SpaceInLambdaLiteral rubocop issues and remove files from rubocop_todo list 2017-06-26 18:05:14 +02:00
Bertocq
f6fe9cc7d2 Fix all Layout/SpaceAroundOperators rubocop issues and remove file list from rubocop_todo list 2017-06-26 18:04:20 +02:00
Bertocq
d7b8777395 Fix all Layout/SpaceAroundEqualsInParameterDefault rubocop issues from rubocop_todo list 2017-06-26 18:03:40 +02:00
Juanjo Bazán
6eca11f993 Merge pull request #1700 from consul/timeline 
Budgets investments timeline
 2017-06-26 18:02:03 +02:00
Bertocq
e6dd33bd66 Fix all Layout/SpaceAfterComma issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
01263050a6 Fix Layout/SpaceAfterNot rubocop issue and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
9763931f55 Fix all Layout/SpaceBeforeComma rubocop issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
b074090e92 Fix Layout/SpaceInsidePercentLiteralDelimiters rubocop issue and remove from rubocop todo list 2017-06-26 17:57:53 +02:00
Bertocq
a76033fb72 Fix all Style/StringLiteralsInInterpolation rubocop issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
80bcf38dc5 Fix all Layout/TrailingWhitespace rubocop issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
cf81c740b1 Fix Style/ZeroLengthPredicate rubocop issue and remove file list from rubocop_todo 2017-06-26 17:57:53 +02:00
Raimond Garcia
6e60f5acde Merge pull request #1680 from consul/chore/small_rubocop_cleanup 
Chore/small rubocop cleanup
 2017-06-26 17:42:10 +02:00
Raimond Garcia
f41d3637cf Merge pull request #1678 from consul/feature/1601#budget_winner_investments_button 
Add button to Calculate Budget Winner investments
 2017-06-26 17:41:08 +02:00
decabeza
4b3d585ecd changes css attributes to alphabetical order 🤓 2017-06-26 17:07:50 +02:00
decabeza
6bb434f0dd improves css units 2017-06-26 17:06:02 +02:00
decabeza
ffff527862 avoids qualifying elements in selectors 2017-06-26 16:51:53 +02:00
decabeza
fac913edde removes empty lines on scss 2017-06-26 16:41:32 +02:00