Commit Graph

9172 Commits

Author SHA1 Message Date
Alessandro Cuoghi
7db98486fe Timeline: Responisve version. Change green color with purple. Aligned title to bullet. 2017-06-24 22:38:48 +02:00
Alessandro Cuoghi
30f6fa9ae6 Created timeline for desktop version. 2017-06-24 22:38:48 +02:00
taitus
c58371a5fe Add milestones to investments show. 2017-06-24 22:38:48 +02:00
taitus
87eeb45584 Rename Seguimiento to Hito. 2017-06-24 22:38:48 +02:00
taitus
f220952883 Add CRUD Milestone on Admin::BudgetInvestment. Rename Checkpoint to Milestone. 2017-06-24 22:38:48 +02:00
taitus
beeb5412d7 New Checkpoint model. Update factories. Model specs. 2017-06-24 22:38:48 +02:00
Alberto
b5da0dfc9a Merge pull request #1687 from consul/improve-proposal
Improve proposal
2017-06-23 20:12:47 +02:00
decabeza
44b5403db5 improves styles and texts of share proposal view 2017-06-23 18:19:43 +02:00
Eduardo Martinez Echevarria
dec6b67dba Update db/schema.rb 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
a42c75647e Add migration to remove featured column from tags table 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
ae9030e6c5 Change categories creation on dev_seeds removing reference to featured attribute 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
e60ffa3c00 Remove featured attribute management on admin/tags 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
eb2e5c58b6 Remove unused featured traits from tags factory 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
fd2c51d4b1 Fix admin/tags test avoiding the use of conditional 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
8dd52110db Use category scope instead of condition on kind on Tag 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
a600dcbb36 Replace category factory in tags with a trait 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
7de6319324 Fix and add some tests on features/admin/tags_specs 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
7fe5fc18b0 Manage only tags of kind 'category' on admin/tags controller 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
debc98ac99 Add category scope and category? method to ActsAsTaggableOn::Tag 2017-06-23 17:34:55 +02:00
Alberto
13d414bac3 Merge pull request #1686 from consul/proposal-improvement-link
Use path instead of url for proposal improvement link
2017-06-23 16:10:46 +02:00
Juanjo Bazán
616efbffed uses path instead of url for proposal improvement link 2017-06-23 13:12:46 +02:00
Juanjo Bazán
84c5b67644 Merge pull request #1681 from consul/gems
Updates gem dependencies
2017-06-22 14:38:19 +02:00
BertoCQ
621ec41ec9 Update Crowdin configuration file 2017-06-22 14:18:22 +02:00
rgarcia
32570c53a9 updates gem dependencies 2017-06-22 13:51:43 +02:00
Raimond Garcia
6667494629 Merge pull request #1670 from consul/feature/1601#generate_budget_heading_winners
Add Budget Investments filter by winners
2017-06-21 17:53:01 +02:00
Alberto
57f4a7b897 Merge pull request #1671 from consul/feature/1590#display_draft_comments_by_default
Display Draft Version comments panel by default
2017-06-21 17:36:46 +02:00
Juanjo Bazán
cf06f13484 Merge pull request #1675 from consul/registration-polish
Removes unused validation
2017-06-21 13:44:09 +02:00
rgarcia
9ebc5ccf34 removes user locale validation 2017-06-21 13:11:59 +02:00
rgarcia
9c12680197 fixes styles for available username
It was always showing red instead of green, even if the username was
available
2017-06-21 13:10:40 +02:00
Raimond Garcia
4ceff0a74f Merge pull request #1669 from consul/fix/french_yml_files
Remove trailing whitespaces from french translation files
2017-06-21 10:17:15 +02:00
Bertocq
56434cf197 Make Draft Version comments panel visible by default, that hides Table of Contents 2017-06-21 02:54:31 +02:00
Bertocq
6c975998c5 Increase darft version feature spec scenario to expect comments visible 2017-06-21 02:54:00 +02:00
Bertocq
4fd3eb643a Add translations for Admin Budget Investments list filter by winner 2017-06-21 01:33:45 +02:00
Bertocq
1a20c1c785 Add winners scope to Budget Investments 2017-06-21 01:32:22 +02:00
Bertocq
6aecb558cc Add Budget Investment winners filter on admin list view and controller 2017-06-21 01:32:09 +02:00
Bertocq
52d23462fe Increase admin budget investment feature spec to check Winner investment filtering on list 2017-06-21 01:30:48 +02:00
Bertocq
3e88795449 Add winner trait to budget_investment factory 2017-06-21 01:30:07 +02:00
Raimond Garcia
09a2f2b795 Merge pull request #1660 from consul/fix/rubocop_issues
Fix some Rubocop issues
2017-06-20 21:49:59 +02:00
Raimond Garcia
91061dc47f Merge pull request #1665 from consul/chore/add_codeclimate_config
Add CodeClimate config file to enable multiple engines
2017-06-20 21:49:29 +02:00
Raimond Garcia
6495abf55c Merge pull request #1666 from consul/users-without-email
Users without email
2017-06-20 21:48:35 +02:00
Juanjo Bazán
3edced4e5e Merge pull request #1668 from consul/styles
Fixes styles
2017-06-20 19:43:34 +02:00
Alberto
6fc59825a6 Merge pull request #1667 from consul/feature/improve_active_category
Mark current Category as active on proposal/budget list
2017-06-20 18:48:30 +02:00
decabeza
a7886c401d fixes submenu active class on admin sidebar 2017-06-20 18:43:23 +02:00
decabeza
5d036bae1a removes unnecessary margin on legislation allegations 2017-06-20 18:43:02 +02:00
decabeza
def93d3e0a fixes legislation processes menu 2017-06-20 18:42:34 +02:00
Bertocq
04b8ac36ad Remove trailing whitespaces on french yml files 2017-06-20 01:01:01 -07:00
Bertocq
1eebc33da9 Fix bad merge conflict on rubocop_todo 2017-06-20 09:57:22 +02:00
Bertocq
e5baecdbfe Use 'active' css class on the active category for both proposals and budgets partials 2017-06-20 09:55:42 +02:00
Bertocq
2c031d75c8 Add active class for category link, similar to :hover 2017-06-19 22:54:30 +02:00
Bertocq
74783ffad2 Add missing :verified trait for User model factory 2017-06-19 18:13:00 +02:00