Commit Graph

11363 Commits

Author SHA1 Message Date
decabeza
5409db6c55 Show only selected investments on map from publishing prices phase
If there are no selected investements show all investments on map.
2019-02-05 14:01:27 +01:00
Alberto
42c065f630 Merge pull request #3253 from consul/admin-polls-list
[Backport] Admin polls list
2019-02-01 16:25:14 +01:00
Alberto
1a7c595dbd Merge pull request #3225 from LumaRay/patch-22
Update documents.yml - add new Russian translation
2019-02-01 12:40:03 +01:00
Alberto
78a1f34dad Merge pull request #3226 from LumaRay/patch-23
Update images.yml - add new Russian translation
2019-02-01 12:38:49 +01:00
Alberto
2477571184 Merge pull request #3224 from LumaRay/patch-21
Update devise.yml - add new Russian translation
2019-02-01 12:38:34 +01:00
Alberto
8012bbae7f Merge pull request #3223 from LumaRay/patch-20
Update community.yml - add new Russian translation
2019-02-01 12:38:20 +01:00
Alberto
a6fde8677e Merge pull request #3222 from LumaRay/patch-19
Update budgets.yml - add new Russian translation
2019-02-01 12:38:13 +01:00
Alberto
3e8a5aa50b Merge pull request #3221 from LumaRay/patch-18
Update activerecord.yml - add new Russian translation
2019-02-01 12:37:59 +01:00
Alberto
971c04e3ce Merge pull request #3220 from LumaRay/patch-17
Update verification.yml - add new Russian translation
2019-02-01 12:37:43 +01:00
Alberto
d815c69cf2 Merge pull request #3219 from LumaRay/patch-16
Update valuation.yml - add new Russian translation
2019-02-01 12:36:37 +01:00
Alberto
74c7fc1eaf Merge pull request #3218 from LumaRay/patch-15
Update social_share_button.yml - add new Russian translation
2019-02-01 12:36:19 +01:00
Alberto
e55c8632f0 Merge pull request #3217 from LumaRay/patch-14
Update settings.yml - add new Russian translation
2019-02-01 12:35:47 +01:00
Alberto
44421d8e74 Merge pull request #3216 from LumaRay/patch-13
Update seeds.yml - add new Russian translation
2019-02-01 12:35:31 +01:00
Alberto
7c9193c30a Merge pull request #3215 from LumaRay/patch-12
Update responders.yml - add new Russian translation
2019-02-01 12:35:22 +01:00
Alberto
a48c4cf47f Merge pull request #3214 from LumaRay/patch-11
Update rails.yml - add new Russian translation
2019-02-01 12:34:53 +01:00
Alberto
0859936b8d Merge pull request #3213 from LumaRay/patch-10
Update pages.yml - add new Russian translation
2019-02-01 12:34:34 +01:00
Alberto
f151aafba0 Merge pull request #3212 from LumaRay/patch-9
Update officing.yml - add new Russian translation
2019-02-01 12:34:04 +01:00
Alberto
14f725cd44 Merge pull request #3211 from LumaRay/patch-6
Update mailers.yml - add new Russian translation
2019-02-01 12:33:48 +01:00
Alberto
6ab9062c81 Merge pull request #3210 from LumaRay/patch-7
Update management.yml - add new Russian translation
2019-02-01 12:33:31 +01:00
Alberto
41fcbdc78b Merge pull request #3209 from LumaRay/patch-8
Update moderation.yml - add new Russian translation
2019-02-01 12:33:16 +01:00
Alberto
6b5431ffd3 Merge pull request #3208 from LumaRay/patch-5
Update legislation.yml - add new Russian translation
2019-02-01 12:33:09 +01:00
Alberto
87464eb620 Merge pull request #3207 from LumaRay/patch-4
Update kaminari.yml - add new Russian translation
2019-02-01 12:33:00 +01:00
Alberto
0f962a6475 Merge pull request #3206 from LumaRay/patch-3
Update general.yml - add new Russian translation
2019-02-01 12:32:42 +01:00
Alberto
5b27a39d9c Merge pull request #3204 from LumaRay/patch-1
Update admin.yml - add new Russian translation
2019-02-01 12:32:21 +01:00
Alberto
8d3b430801 Merge pull request #3205 from LumaRay/patch-2
Update devise_views.yml - add new Russian translation
2019-02-01 12:31:35 +01:00
decabeza
dfd4f60e15 Order admin poll list by starts_at date 2019-01-31 18:49:24 +01:00
decabeza
5ea1275e6a Change admin poll list title 2019-01-31 18:24:28 +01:00
Alberto
9475a0c6ee Merge pull request #3249 from consul/custom-pages
Refactor processes header colors and custom pages
2019-01-30 20:05:20 +01:00
Julian Nicolas Herrero
0e9fd645e8 Merge pull request #3234 from consul/use_find_instead_of_find_by_id
[Backport] Use find instead of find_by_id
2019-01-30 19:46:22 +01:00
decabeza
483182ceed Refactor scopes on site customization page model 2019-01-30 18:03:58 +01:00
Alberto
644c803db6 Merge pull request #3250 from consul/budget-ui
[Backport] Improve UI of budgets index page
2019-01-30 15:02:47 +01:00
decabeza
773302f0d7 Show only random order for unfeasible and unselected investments 2019-01-30 14:16:25 +01:00
decabeza
849dcb7a1a Fix map overlapping links 2019-01-30 14:16:19 +01:00
decabeza
7de846f55c Hide heading links if budget is finished 2019-01-30 14:15:49 +01:00
decabeza
9edabb5bf4 Fix links on budgets index page 2019-01-30 14:15:40 +01:00
decabeza
cdb66ce23c Refactor header process colors specs 2019-01-30 13:17:35 +01:00
decabeza
41f9ef167d Refactor hexadecimal color validation 2019-01-30 13:17:04 +01:00
decabeza
865dca85bf Improve layout of admin legislation process form 2019-01-30 13:16:35 +01:00
decabeza
5893ed7587 Create helper for legislation process header with custom colors 2019-01-30 13:15:42 +01:00
decabeza
2695e19e2f Fix hound warnings 2019-01-29 17:54:02 +01:00
Julian Nicolas Herrero
81b65ec821 Merge pull request #3202 from consul/sort_legislation_processes_by_start_date
Sort Legislation Processes by descending start date
2019-01-29 17:30:02 +01:00
Alberto
41fe1e3922 Merge pull request #3152 from NahiaSolutions/add_image_to_legislation_processes
Add image to legislation processes and banner colors
2019-01-29 16:06:54 +01:00
Alberto
ebe5bf13e7 Merge pull request #3149 from NahiaSolutions/add_cards_to_custom_pages
Add cards to custom pages
2019-01-29 16:05:47 +01:00
Alberto
78479ff0e7 Merge pull request #3228 from consul/milestones_public_progress_bar
[Backport] Add progress bars to milestones public view
2019-01-29 14:12:08 +01:00
Alberto
bd4826b25e Merge branch 'master' into add_cards_to_custom_pages 2019-01-28 14:49:39 +01:00
Alberto
c297595e49 Merge branch 'master' into add_image_to_legislation_processes 2019-01-28 14:49:19 +01:00
Julian Herrero
3bf2fa1b17 Add method find_by_slug_or_id to Sluggable module
Make it easier to find by slug or id for sluggable models. Will return
nil if resource is not found.
2019-01-25 09:08:28 +01:00
Julian Herrero
9a23393535 Use find instead of find_by_id
This method will raise an exception if resource is not found when
trying to call score_action on nil.
Prefer to raise a 404 HTML NotFound error instead.
2019-01-25 09:03:56 +01:00
Julian Herrero
23b6e38915 Remove unused before_action 2019-01-25 08:54:28 +01:00
Julian Herrero
0af5972d63 Use correct param in controller 2019-01-25 08:48:44 +01:00