consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,208 Commits 1 Branch 0 Tags
154cdac33233b7bdfe09b51b43e08d4a1e4ad9ef
Commit Graph

3754 Commits

Author SHA1 Message Date
Bertocq
154cdac332 Add calculate_winners on Admin Budget controller, route and ability for admins 2017-06-25 15:47:04 +02:00
decabeza
44b5403db5 improves styles and texts of share proposal view 2017-06-23 18:19:43 +02:00
Juanjo Bazán
616efbffed uses path instead of url for proposal improvement link 2017-06-23 13:12:46 +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
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
Bertocq
56434cf197 Make Draft Version comments panel visible by default, that hides Table of Contents 2017-06-21 02:54:31 +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
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
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
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
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
Juanjo Bazán
315c57929a allows managers to create users without email 
allows managers to create users without email

hides email preferences from account page for email-less users

prevents email delivery to users with no email

adds spec for user creation from management

adds specs for user's email requirement

adds spec for no deliveries if no email
 2017-06-19 13:02:48 +02:00
Raimond Garcia
3917f2d999 Merge pull request #1658 from consul/chore/add_coffeelint_config 
Add CoffeeLint configuration file && Fixes
 2017-06-19 10:45:41 +02:00
Bertocq
25e501c668 Fix Style/AndOr rubocop issue and remove from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
256eb682d0 Fix Rails/RequestReferer rubocop issue and remove from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
f6863f5ea0 Rubocop autocorrect Performance/RedundantBlockCall issue and remove it from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
6e1fa53e2c Fix Lint/DefEndAlignment rubocop issues and remove from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
21c6d1c4dd Cleanup Lint/AssignmentInCondition rubocop issues on code and remove it from ruboco_todo list 2017-06-19 10:45:18 +02:00
Bertocq
87e73e772c Remove all Lint/AmbiguousRegexpLiteral rubocop issues on code, and from rubocop_todo list 2017-06-19 10:45:18 +02:00
Raimond Garcia
eb829837dc Merge pull request #1615 from waagsociety/dutch 
Dutch
 2017-06-17 10:56:31 +02:00
BertoCQ
5b6ef26336 Merge branch 'master' into chore/add_coffeelint_config 2017-06-16 18:28:31 +02:00
decabeza
76b7f66fb3 fixes scss lint warnings 2017-06-16 12:09:01 +02:00
Bertocq
2965b31504 Remove unnecesary space on coffeescript file 2017-06-16 00:06:42 +02:00
Bertocq
0379a66c77 Remove unnecesary empty parameter list on coffeescript file 2017-06-16 00:06:26 +02:00
Bertocq
3db13da2b1 Fix indentation on multiple coffeescript files 2017-06-16 00:05:07 +02:00
Bertocq
8f682901ed Fix Operators must be spaced properly rule on multiple coffeescript files 2017-06-16 00:03:34 +02:00
Bertocq
2c4139d4ac Remove trailing whitespace from tracks coffee file 2017-06-16 00:02:06 +02:00
Bertocq
6eb2647c1c Fix CoffeeLint rule 'Line contains a trailing semicolon' across multiple files 2017-06-16 00:01:05 +02:00
Juanjo Bazán
9ab0f9cf8b Merge branch 'master' into amiedes-api-dev-PRs-2 2017-06-14 12:46:58 +02:00
Raimond Garcia
ae82a563d6 Merge pull request #1651 from consul/fix/direct_message_today_scope 
Fix DirectMessage today scope
 2017-06-14 11:42:54 +02:00
kikito
782a68e9d3 Merge branch 'master' into amiedes-api-dev-PRs-2 2017-06-14 09:58:17 +02:00
Bertocq
129e93dd12 Use Time.current converted to Date by the database DirectMessage today scope 
Why:

* Database stores created_at as timestamp with the timezone, so when comparing DATE(created_at) to something we have to convert it to DATE as well with the postresql native function, but using Time.current instead of Date.current to take into account the user timezone
 2017-06-14 01:15:26 +02:00
Bertocq
33e825672c Rename label for legislation process active checkbox to enabled on both translations and form 2017-06-13 23:56:31 +02:00
Bertocq
4ea5df4012 Display only the Legislation Process dates for those phase/publication enabled 2017-06-13 23:50:45 +02:00
Bertocq
73ff68815d Update admin legislation process controller and form to allow enabling/disabling phase/publications 2017-06-13 23:50:12 +02:00
Bertocq
a147765273 Add enabled_phases_and_publications_count helper method on legislation process for views 2017-06-13 23:48:31 +02:00
Bertocq
cb7358bb97 Send to both Phase and Publication classes the enabled flag and use for enabled? helper method 2017-06-13 23:47:14 +02:00
Bertocq
004c128b6c Fix phase name symbol on legislation process key_dates view 2017-06-13 22:04:36 +02:00
Bertocq
2018fc0b7d Fix Legislation Process Controller to correctly set both @phase and @process 2017-06-13 22:04:36 +02:00
Bertocq
990437dc40 Remove no longer used active/show/open _phase helper methods from Legislation Process, and specs 2017-06-13 22:04:36 +02:00
Bertocq
8710d8c0d3 Replace old active_phase? for new phase/publication enabled? for legislation processes 2017-06-13 22:04:36 +02:00
Bertocq
1b260c91f0 Replace old show_phase? for new phase/publication started? for legislation processes 2017-06-13 22:04:36 +02:00
Bertocq
523988a291 Replace old open_phase? method for new phase/publication open? on Legislative Process 2017-06-13 22:04:36 +02:00