consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,107 Commits 1 Branch 0 Tags
2a095a3b8258cc4a23f3d12c93e550a870b18eaa
Commit Graph

1074 Commits

Author SHA1 Message Date
Juanjo Bazán
9ab0f9cf8b Merge branch 'master' into amiedes-api-dev-PRs-2 2017-06-14 12:46:58 +02:00
kikito
782a68e9d3 Merge branch 'master' into amiedes-api-dev-PRs-2 2017-06-14 09:58:17 +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
2018fc0b7d Fix Legislation Process Controller to correctly set both @phase and @process 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
e55328caf4 Rename legislation process final_version_publication phase name to more descriptive result_publication 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
rgarcia
b1fa2d22f7 only count active users in stats 2017-06-13 12:59:04 +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
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
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
89d2793d76 Setup suggest action in investments controller 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
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
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
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
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
Juanjo Bazán
5daad49208 Merge pull request #1607 from consul/index-design 
Index design
 2017-06-08 13:58:04 +02:00
Bertocq
02524b164a Rubocop autocorrections (indentations, revers unless to if, extra spaces) 2017-06-08 12:14:35 +02:00
Bertocq
c05744b846 Add summary field to the admin form for Legislative Processes, plus placeholder translations 2017-06-07 18:43:34 +02:00
Juanjo Bazán
16edbf15a2 Merge pull request #1620 from consul/medialab-legislation 
Adds Collaborative Legislation
 2017-06-07 18:06:15 +02:00
rgarcia
792b15b224 Merges annotations 2017-06-07 14:58:34 +02:00
decabeza
ea38f79442 removes specs of proposals successful banner 2017-06-05 17:55:37 +02:00
decabeza
c76bd65b40 removes old proposals successful banner 2017-06-05 16:29:48 +02:00
Bertocq
cf8bc486e4 Rename proposal_improvement_url to proposal_improvement_path to truly describe the value that the variable holds 2017-05-31 12:51:01 +02:00
Bertocq
438aaa65f6 Merge author param into Proposal building at proposal controller create action 2017-05-31 11:10:27 +02:00
Bertocq
520563d54f Add proposal improvement info link to share page, and make it option through Setting variable 2017-05-31 10:59:31 +02:00
Bertocq
29f59e2af5 Add create method on proposals controller to redirect to proposal share page with notice after save 2017-05-31 10:59:30 +02:00
Bertocq
b2c79174aa Add new Proposal share endpoint, plus ability for ereryone to use it 2017-05-31 10:59:30 +02:00
rgarcia
1a46b4d4cb fixes conflicts with master 2017-05-31 10:36:38 +02:00
Juanjo Bazán
1ae55a59f6 Merge pull request #1560 from bertocq/feature/admin_administrators_management 
Administrators management in admin area
 2017-05-30 10:44:50 +02:00
Alberto Miedes Garcés
18db68a430 Force pagination, limit query depth and complexity 2017-05-29 09:47:39 +02:00
Bertocq
fe5ddd019b Add logic to prevent the current user from removing himself from the administrator list, and a flash error notice for that scenario 2017-05-25 11:29:39 +02:00
Bertocq
9506855a44 Add Admin Administrator route, controller and manage ability for admin users 2017-05-23 22:49:44 +02:00
rgarcia
80be0c6b65 refactors zip file creation 2017-05-23 16:46:10 +02:00
rgarcia
8f4eec2b8e zips all users with newsletter activated 2017-05-23 16:46:05 +02:00
rgarcia
2a7ff2270e sends zip file with test data 2017-05-23 16:45:34 +02:00
decabeza
5e0d5fc8c3 Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation 2017-05-22 18:43:49 +02:00
Juanjo Bazán
bf8651febc Merge pull request #1555 from consul/budgets-results 
Budget Results
 2017-05-22 17:11:22 +02:00
rgarcia
ed5a1cecbb adds budget results 2017-05-19 14:04:46 +02:00
Juanjo Bazán
e922a11aa3 permits fields in management investment creation 2017-05-19 11:32:14 +02:00
Juanjo Bazán
86c37d4952 removes old commented code 2017-05-16 13:12:55 +02:00
Juanjo Bazán
3eb22ab7b9 removes exception on invalid vote 
responds rendering correct error message instead
 2017-05-16 13:12:32 +02:00