Commit Graph

13635 Commits

Author SHA1 Message Date
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
Julian Herrero
24a3289fa8 Add spec for Staging email recipients 2019-01-31 17:49:09 +01:00
decabeza
64cbed838a Fix hound warnings 2019-01-31 17:23:45 +01:00
decabeza
6bb3c0a3da Add columns on welcome card view 2019-01-31 17:20:04 +01:00
decabeza
47877f1bcd Remove unnecessary title on page cards 2019-01-31 17:08:01 +01:00
decabeza
40a42b0c63 Show card label only if it is present 2019-01-31 17:07:51 +01:00
decabeza
98f550fc18 Add columns on pages card view and improve css layout 2019-01-31 17:06:44 +01:00
decabeza
f00b504f55 Improve notice message for pages cards 2019-01-31 17:06:22 +01:00
decabeza
e7fcf2ce35 Add select on cards form to select the number of columns 2019-01-31 17:06:01 +01:00
decabeza
b8bfccd2ba Add columns to widget cards 2019-01-31 14:38:14 +01:00
Julian Herrero
c9e172049c Add prefix to staging emails subject 2019-01-31 11:13:23 +01:00
Ziyan Junaideen
73b49adcc4 Secret yml update + checking for presence of recipients 2019-01-31 10:50:59 +01:00
Ziyan Junaideen
49a2fde86c Remove unwanted config from staging.rb 2019-01-31 10:50:59 +01:00
Ziyan Junaideen
7dc999f437 Recipient interceptor initializer 2019-01-31 10:50:59 +01:00
Ziyan Junaideen
1322955790 Email interceptor - staging 2019-01-31 10:50:37 +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
Alberto
4c511c534a Merge pull request #3231 from consul/poll-answer-documents
[Backport] Allow admins delete poll answer documents
2019-01-24 22:21:20 +01:00
rgarcia
dacc2d529d Fix destroy document specs
We were linking to the document url itself, which does not have a route
associated and so the specs fails

With this commit we are using the correct path to the destroy action of
the DocumentsController.

We are also using the referrer instead of a params[:from] attribute, as
it avoids having to pass an extra parameter, making the code prettier
and it works the same way
2019-01-24 21:39:43 +01:00
decabeza
b588cd3a0b Add missing i18n 2019-01-24 21:39:08 +01:00
Julian Herrero
8f112cf37e Allow admins delete poll answer documents 2019-01-24 19:19:04 +01:00
decabeza
d650b90e25 Adds missing backport content on progressable specs 2019-01-24 18:33:26 +01:00
Alberto
5d790eae67 Merge pull request #3230 from consul/admin-images-map
[Backport] Allow change map image from admin
2019-01-24 17:48:02 +01:00