consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,983 Commits 1 Branch 0 Tags
0a668114d0800c780a76fd0cc9a58aa24401d77f
Commit Graph

7983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
kikito
a580e60786 refactor public_for_api acts_as_taggable scopes 2017-06-13 16:14:24 +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
c4ba6a7e94 updates specs 2017-06-12 19:48:57 +02:00
Alberto
73f1dab2ab Merge pull request #1642 from consul/fix/legislative_process_table_of_contents 
Fix Table of Contents rotated text margin&line height
 2017-06-12 19:11:15 +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
d323510390 Merge pull request #1639 from divyanshumehta/master 
Added link to Roadmap in documentation
 2017-06-12 13:03:17 +02:00
divyanshumehta
52a382c150 Added link to Roadmap in documentation 2017-06-12 16:28:49 +05:30
Juanjo Bazán
62071c50e0 updates mail 2017-06-12 12:10:55 +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
Raimond Garcia
89aa4237ad Merge pull request #1632 from consul/feature/1587#remove_target_participate_fields 
Remove 'target' and 'how_to_participate' from Legislative Processes
 2017-06-12 09:17:04 +02:00
Eduardo Martinez Echevarria
2380b97bd0 Make budgets result show action available only when budget is finished 2017-06-11 23:33:05 +02:00
Eduardo Martinez Echevarria
1802202033 Add test to check that results of unfinished budgets are inaccessible 2017-06-11 23:29:56 +02:00
Eduardo Martinez Echevarria
4616e891e6 Add i18 labels for suggestions on investments 2017-06-11 14:10:29 +02:00
Eduardo Martinez Echevarria
89d2793d76 Setup suggest action in investments controller 2017-06-11 14:10:29 +02:00
Eduardo Martinez Echevarria
0aa2cd99ac Add suggest to investments form in title field 2017-06-11 14:10:29 +02:00
Eduardo Martinez Echevarria
2e67c860fd Setups in investments controller for Polymorphic concern 2017-06-11 14:10:29 +02:00
Eduardo Martinez Echevarria
afad69fb71 Add suggest to investments in routes 2017-06-11 13:39:07 +02:00
Eduardo Martinez Echevarria
68f26ccfbf Allow the use of a custom path method in suggest partial 
The path to investments in lists is generated with a helper
method named namespaced_budget_investments_path. This allows
its use in the shared suggest partial. Also, as nested
resource in routes, link_to("title", investments) fails.
 2017-06-11 13:28:16 +02:00
Eduardo Martinez Echevarria
fd1c61ae61 Add resource_relation to Polymorphic concern 
This allows suggest action to send search to
a relation instead of directly the model. Doing
so, the suggested items can be previously filtered.
 2017-06-11 13:19:12 +02:00
Eduardo Martinez Echevarria
180ed1ce99 Set cancan permissions for suggest on Budget::Investment 2017-06-11 13:13:50 +02:00
Eduardo Martinez Echevarria
74754ef34d Add some test to investments feature for suggestions on creation 2017-06-11 13:04:58 +02:00
Bertocq
41ec36f470 Correct the Legislative Process description column width to occupy full page now that its alone 2017-06-11 11:01:18 +02:00
Bertocq
b79df113cd Switch all Time.curren.to_date for Date.current, same result but better syntax 2017-06-11 10:41:09 +02:00
Bertocq
e14a5b2eaf Avoid using Date.today, better to use Date.current that takes timezone into account 2017-06-11 10:41:06 +02:00
Bertocq
2c82eec0fd Remove target and how_to_participate columns from legislation_processes table, no longer used 2017-06-11 00:04:50 +02:00
Bertocq
e377314b52 Add .github/PULL_REQUEST_TEMPLATE file to be used as default template when manually creating a PR at github 2017-06-10 23:39:17 +02:00
Bertocq
02d31953be Remove Target field from Legislative Process from views, i18n, factories and specs 2017-06-10 23:16:13 +02:00
Bertocq
d624a08abc Remove How To Participate field from Legislative Process from views, i18n, factories and specs 2017-06-10 23:11:55 +02:00
Raimond Garcia
79dfdb88b4 Merge pull request #1631 from PopulateTools/1489-admin-section-for-users 
Admin section for users
 2017-06-09 20:28:43 +02:00
Amaia Castro
67942e0619 Display roles for users 2017-06-09 17:50:42 +02:00
Amaia Castro
b616210607 View and search users from admin panel 2017-06-09 17:30:06 +02:00
Amaia Castro
29d994dd4a Rename users to hidden users in admin 2017-06-09 17:19:01 +02:00
Raimond Garcia
60842a548c Merge pull request #1629 from consul/gems 
Updates mail gem
 2017-06-09 11:38:11 +02:00
rgarcia
6f9e646a26 updates mail gem 2017-06-09 11:21:52 +02:00
Juanjo Bazán
5daad49208 Merge pull request #1607 from consul/index-design 
Index design
 2017-06-08 13:58:04 +02:00
decabeza
3d6f75bb59 reverts hide tags on index views 2017-06-08 13:30:12 +02:00
Juanjo Bazán
75ff6620b4 Merge pull request #1622 from bertocq/chore/rubocop_autocorrections 
Rubocop autocorrections
 2017-06-08 12:43:46 +02:00