Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream #1060

Merged
merged 21 commits into from
Dec 15, 2017
Merged

Upstream #1060

merged 21 commits into from
Dec 15, 2017

Commits on Dec 13, 2017

  1. adds timestamps to polls

    @voodoorai2000
    voodoorai2000 committed Dec 13, 2017
    Configuration menu
    Copy the full SHA
    56a7c46 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2017

  1. Add 'publication_date' attribute to Budget::Investment::Milestone

    @aitbw
    aitbw committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    c14f9be View commit details
    Browse the repository at this point in the history

  2. Admins can add a 'publication date' to milestones

    @aitbw
    aitbw committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    6d57d76 View commit details
    Browse the repository at this point in the history

  3. End-users will be shown a milestone's publication date if available

    @aitbw
    aitbw committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    03ae14c View commit details
    Browse the repository at this point in the history

  4. Adapt existing milestone-related specs to fit the new requirement

    @aitbw
    aitbw committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    1e1028d View commit details
    Browse the repository at this point in the history

  5. Make Budget::Investment::Milestone class Documentable. 

    Add fields to the milestone form so that the admin can attach 0, 1 or multiple documents.
Add column to milestone list with a link to documents (if there is any).
Make documents accessible from the milestone view for users.
    iagirre committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    01a8c55 View commit details
    Browse the repository at this point in the history

  6. Add feature specs to test new admin features and documents' show in u… 

    …sers view
    iagirre committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    ff50dc1 View commit details
    Browse the repository at this point in the history

  7. Update unreleased section of Changelog

    @bertocq
    bertocq committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    7399e5f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into aperez-dates-for-milestones

    @bertocq
    bertocq committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    50b4f50 View commit details
    Browse the repository at this point in the history

  9. refactors notifications into concerns and shared examples

    @voodoorai2000
    voodoorai2000 committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    2b52d26 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into aperez-dates-for-milestones

    @decabeza
    decabeza committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    e675cee View commit details
    Browse the repository at this point in the history

  11. Merge pull request consuldemocracy#2191 from wairbut-m2c/iagirre-add-… 

    …documents-to-milestones

Add documents to milestones
    @decabeza
    decabeza committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    09b5447 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into aperez-dates-for-milestones

    @decabeza
    decabeza committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    1737f85 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into aperez-dates-for-milestones

    @decabeza
    decabeza committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    76a3dd5 View commit details
    Browse the repository at this point in the history

  14. delete unnecessary parenthesis

    @decabeza
    decabeza committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    b4782f7 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #2188 from wairbut-m2c/aperez-dates-for-milestones 

    Add publication date for milestones
    @decabeza
    decabeza committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    a46863a View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'upstream/master' into upstream

    @decabeza
    decabeza committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    23eaffc View commit details
    Browse the repository at this point in the history

  17. Merge pull request #2187 from consul/notifications 

    Fix notifications' exceptions
    @voodoorai2000
    voodoorai2000 committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    9ba8ca7 View commit details
    Browse the repository at this point in the history

  18. fixes conflicts with upstream

    @voodoorai2000
    voodoorai2000 committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    3f7484d View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2017

  1. Merge branch 'master' into upstream

    @voodoorai2000
    voodoorai2000 committed Dec 15, 2017
    Configuration menu
    Copy the full SHA
    bf86eea View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1061 from AyuntamientoMadrid/notifications 

    Fix Notifications
    @voodoorai2000
    voodoorai2000 committed Dec 15, 2017
    Configuration menu
    Copy the full SHA
    1e1ab12 View commit details
    Browse the repository at this point in the history