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

3782 Commits

Author SHA1 Message Date
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
Bertocq
10954859c7 Add debate/allegations phases and draft/result publications helper methods to Legislation Process 2017-06-13 22:04:36 +02:00
Bertocq
e55328caf4 Rename legislation process final_version_publication phase name to more descriptive result_publication 2017-06-13 22:04:36 +02:00
Bertocq
edee908fc1 Create Legislation Process Phase and Publication classes to enclose enabled?/started?/open? logic 2017-06-13 22:04:36 +02:00
Bertocq
0c27f1ffde Rename Legislation Process final_publication_date field to more descriptive result_publication_date 2017-06-13 22:04:36 +02:00
Juanjo Bazán
e26072b08c Merge pull request #1648 from consul/accessibility 
Accesibility screen readers
 2017-06-13 19:52:16 +02:00
Raimond Garcia
467560e895 Merge pull request #1646 from consul/user-stats 
Only count active users in stats
 2017-06-13 17:54:13 +02:00
decabeza
3bcfaeb61a replaces sr-only class to show-for-sr 2017-06-13 17:51:57 +02:00
kikito
430e020a6a refactors public_for_api in vote 2017-06-13 16:27:09 +02:00
Raimond Garcia
300634443c Merge pull request #1645 from consul/login-by-username 
Allow users to login using username
 2017-06-13 13:23:49 +02:00
rgarcia
b1fa2d22f7 only count active users in stats 2017-06-13 12:59:04 +02:00
Juanjo Bazán
2f895d2f6b removes else case 2017-06-13 12:22:48 +02:00
kikito
92633195d9 refactors proposal_notification.public_for_api 2017-06-13 12:19:02 +02:00
kikito
0ad1ff5845 changes the way public_for_api is calculated in comment 2017-06-13 12:11:20 +02:00
kikito
1701111bf5 Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2 2017-06-13 12:07:28 +02:00
Alberto
0e6c689abe Merge pull request #1641 from PopulateTools/fix-broken-link 
Fix broken link
 2017-06-13 11:13:08 +02:00
Juanjo Bazán
ed30051653 avoids conflicts with users using email as username 2017-06-12 18:54:39 +02:00
Bertocq
85d9fa7b6b Correct table of contents rotated text margin and line height 2017-06-12 17:38:20 +02:00
Juanjo Bazán
3f11dbe1d5 allows login using username or email 2017-06-12 17:26:38 +02:00
Amaia Castro
ed777d7c92 Fix broken link 2017-06-12 15:47:30 +02:00
Raimond Garcia
58da3b43e6 Merge pull request #1638 from entantoencuanto/issue#1595-results_url_permissions 
Issue#1595 results url permissions
 2017-06-12 13:09:27 +02:00
Raimond Garcia
05afaacf3d Merge pull request #1635 from entantoencuanto/issue#1354-suggest_on_investments_creation 
Issue#1354 suggest on investments creation
 2017-06-12 13:09:09 +02:00
Raimond Garcia
1033c9fc11 Merge pull request #1634 from consul/fix/date_time_current_usage 
Fix Flaky test related with Time/Date in Search concern
 2017-06-12 09:53:09 +02:00