consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,828 Commits 1 Branch 0 Tags
d901b09560b9e73eaf35d4dd90fef6c79b66d9a1
Commit Graph

3854 Commits

Author SHA1 Message Date
Julian Herrero
ef835bef1c new algorithm for filter 'most active' 2018-12-13 11:42:22 +01:00
Julian Herrero
96dfa2fd65 add setting for new 'most active' algorithm 2018-12-13 11:41:27 +01:00
Javier Martín
8bcf713d10 Merge pull request #3100 from consul/backport-2743-add_milestones_to_legislation_processes 
Add milestones to legislation processes
 2018-12-12 15:12:36 +01:00
Javi Martín
f96cab2f1c Update references to investment status 
We've made milestone status polymorphic, and so the texts need to be
updated.
 2018-12-11 20:27:54 +01:00
Javi Martín
a42f5fab37 Add milestones summary to legislation processes 2018-12-11 20:19:48 +01:00
Javi Martín
b95ca9df8a Add milestones to legislation process view 2018-12-11 20:18:53 +01:00
Javi Martín
03dc43a500 Manage legislation process milestones 2018-12-11 20:18:53 +01:00
Javi Martín
2fcbee6261 Manage proposal milestones 2018-12-11 20:09:47 +01:00
Javi Martín
4770217373 Add proposals index in admin 2018-12-11 20:09:30 +01:00
Javi Martín
df29b49d05 Make milestones view reusable 2018-12-11 19:22:55 +01:00
Javi Martín
64d6b7491a Make partial listing milestones reusable 
So it isn't specific to budget investments anymore.
 2018-12-11 19:22:55 +01:00
Julian Herrero
fcfee3a906 apply missing requeriments in PR #3043 
In this PR https://github.com/consul/consul/pull/3043
there were some change requests. In order to keep moving
we decided to merge the PR and do the changes ourselves.
 2018-12-11 18:21:14 +01:00
Julian Nicolas Herrero
6aa54d6c62 Merge branch 'master' into content_blocks_for_headings 2018-12-11 16:40:25 +01:00
Julian Nicolas Herrero
9aab3ddd7b Merge pull request #3038 from MatheusMiranda/add_map_to_heading_page 
Add map to sidebar on Heading's page
 2018-12-11 16:32:35 +01:00
Alberto
05abcbe944 Merge pull request #3081 from consul/featured-proposals 
[Backport] Featured proposals
 2018-12-10 22:17:51 +01:00
Javier Martín
feb4af21c7 Merge pull request #3083 from consul/backport-milestone_polymorphic_path 
Make milestones controller polymorphic
 2018-12-10 18:37:15 +01:00
Javier Martín
3631ff7340 Merge pull request #3074 from consul/backport-refactor_legislation_process_subnav 
Refactor legislation process subnav
 2018-12-05 13:32:22 +01:00
Javier Martín
fc5a5e58de Merge pull request #3073 from consul/backport-rename_hidden_proposals 
[Backport] Rename Admin::Proposals to Admin::HiddenProposals
 2018-12-05 13:30:23 +01:00
Javi Martín
2c2831beb0 Use polymorphic paths for milestones 2018-12-05 12:23:52 +01:00
Javier Martín
4f9ca04a84 Merge pull request #3057 from consul/backport-make-milestones-polymorphic 
[Backport] Make milestones polymorphic
 2018-12-05 12:12:04 +01:00
decabeza
37da986014 Adds settings for featured proposals 2018-12-04 18:04:36 +01:00
decabeza
04e3bf5797 Removes references to deleted general terms page 2018-12-04 17:25:34 +01:00
Javi Martín
baa7ddc4cc Remove unused key 2018-11-30 18:11:19 +01:00
Javi Martín
abf48af331 Rename draft_texts key to draft_versions 
This way we can refactor the legislation tabs, since now all translation
keys follow the same convention (using the same name as the active tab
name).
 2018-11-30 18:09:51 +01:00
Javi Martín
45a41a7528 Rename Admin::Proposals to Admin::HiddenProposals 
The same way we do it with users and budget investments.
 2018-11-30 18:04:55 +01:00
Javi Martín
f240977ed0 Update milestone I18n keys for all languages 2018-11-30 14:15:21 +01:00
Javi Martín
f6689cc69d Update obsolete milestones I18n keys 2018-11-30 14:15:21 +01:00
Marko Lovic
c0f6fa182f Make Milestones general, and not specific to Budget Investments 
Generalize the Budget::Investment::Milestone model to a
polymorphic Milestone model so it can be used for entities
other than Budget::Investment.
 2018-11-30 14:15:21 +01:00
Marko Lovic
81f516efd7 Change BudgetInvestmentStatus to Milestone::Status 
Generalize the BudgetInvestmentStatus model to Milestone::Status so it
is not specific to budget investments, but can be used for any entity
which has milestones. This is in preparation to make the Milestone
model polymorphic and usable by entities other than budget investments.
 2018-11-30 14:15:21 +01:00
Milber Champutiz Burbano
9f455b9165 Added feature to add content block to headings in sidebar -- rebase 2018-11-27 09:37:35 -05:00
Raimond Garcia
ed9e501ae7 Merge branch 'master' into add_map_to_heading_page 2018-11-27 11:07:16 +01:00
Raimond Garcia
2ef83619c3 Merge pull request #3048 from jaflutz/2930-draft-phase-processes 
Adds draft phase functionality in legislation processes
 2018-11-27 11:01:27 +01:00
Raimond Garcia
e4b0f2781d Merge pull request #3062 from danesjenovdan/slovenian-translations 
Added Slovenian translations
 2018-11-26 19:11:58 +01:00
Alberto
1bb50cbe47 Merge pull request #3056 from consul/administrator-id 
[Backport] Administrator ID
 2018-11-26 15:05:11 +01:00
Alberto
f535a90826 Merge pull request #3055 from consul/admin-poll-officers 
[Backport] Admin poll officers
 2018-11-26 15:03:55 +01:00
Alberto
fce5fdff0d Merge pull request #3053 from consul/budget-investment-social-share 
[Backport] Budget investments social share
 2018-11-26 14:57:53 +01:00
peric
275cbf1adc Added Slovenian translations 2018-11-24 16:45:41 +01:00
Consul Bot
2fa19d5831 New translations mailers.yml (Arabic) 2018-11-22 13:22:12 +01:00
Consul Bot
3b4670d7bd New translations admin.yml (Arabic) 2018-11-22 13:11:37 +01:00
Consul Bot
fa0a726d7e New translations mailers.yml (Arabic) 2018-11-22 12:51:17 +01:00
Consul Bot
2110223a14 New translations mailers.yml (Arabic) 2018-11-22 12:41:10 +01:00
Consul Bot
264ecd2ce3 New translations devise_views.yml (Arabic) 2018-11-22 12:41:08 +01:00
Consul Bot
c34ebb0d52 New translations devise_views.yml (Arabic) 2018-11-22 12:31:07 +01:00
Consul Bot
12c050aac6 New translations pages.yml (Arabic) 2018-11-22 12:31:05 +01:00
Consul Bot
71a2d4844e New translations pages.yml (Arabic) 2018-11-22 12:21:36 +01:00
Consul Bot
4be0c11638 New translations moderation.yml (Arabic) 2018-11-22 12:21:35 +01:00
Consul Bot
78fdff63c8 New translations moderation.yml (Arabic) 2018-11-22 12:11:50 +01:00
Consul Bot
8ae3d39a74 New translations admin.yml (Somali) 2018-11-22 11:51:36 +01:00
Consul Bot
9415492401 New translations admin.yml (Somali) 2018-11-22 11:42:41 +01:00
decabeza
ae3a2ed3f3 Adds administrator id on admin administrators index page 2018-11-22 11:41:54 +01:00