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

added hourly and money budgets to activity, project and customer #843

Merged
merged 41 commits into from
Jun 11, 2019
Merged

added hourly and money budgets to activity, project and customer #843

merged 41 commits into from
Jun 11, 2019

Commits on Jun 5, 2019

  1. import budgets from v1

    @kevinpapst
    kevinpapst committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    2523287 View commit details
    Browse the repository at this point in the history

  2. php docs

    @kevinpapst
    kevinpapst committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    3791b81 View commit details
    Browse the repository at this point in the history

  3. updated API docs config

    @kevinpapst
    kevinpapst committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    500bd95 View commit details
    Browse the repository at this point in the history

  4. added budget and time_budget fields to customer, project and activity

    @kevinpapst
    kevinpapst committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    0889874 View commit details
    Browse the repository at this point in the history

  5. respect rate visibility permissions on dashboard

    @kevinpapst
    kevinpapst committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    eb6168f View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2019

  1. Merge branch 'master' into budgets

    @kevinpapst
    kevinpapst committed Jun 7, 2019
    Configuration menu
    Copy the full SHA
    f26114e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into budgets 

    # Conflicts:
#	src/Entity/Project.php
    @kevinpapst
    kevinpapst committed Jun 7, 2019
    Configuration menu
    Copy the full SHA
    2669a6a View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2019

  1. added additional travis check for composer

    @kevinpapst
    kevinpapst committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    5ed4507 View commit details
    Browse the repository at this point in the history

  2. fix funding

    @kevinpapst
    kevinpapst committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    1b948f9 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2019

  1. fix group by

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    4b0db91 View commit details
    Browse the repository at this point in the history

  2. updated statistic models

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    370e6ed View commit details
    Browse the repository at this point in the history

  3. phpdoc

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    e8c6d69 View commit details
    Browse the repository at this point in the history

  4. removed unused message

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    ba653e9 View commit details
    Browse the repository at this point in the history

  5. new progressbar macro

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    1f98edc View commit details
    Browse the repository at this point in the history

  6. simplified delete translations

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    8f816ea View commit details
    Browse the repository at this point in the history

  7. mark integration tests

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    b049e29 View commit details
    Browse the repository at this point in the history

  8. fixed integration group and wrongly extended KernelTestCase

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    5cee5f1 View commit details
    Browse the repository at this point in the history

  9. new budget permission

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    30ca349 View commit details
    Browse the repository at this point in the history

  10. removed budget column from project index screen

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    552c16c View commit details
    Browse the repository at this point in the history

  11. new budget screens

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    172a01e View commit details
    Browse the repository at this point in the history

  12. links for new budget screen

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    5c78e84 View commit details
    Browse the repository at this point in the history

  13. upgraded test database

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    381edd4 View commit details
    Browse the repository at this point in the history

  14. set time and money budget in fixtures

    @kevinpapst
    kevinpapst committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    ede73f9 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2019

  1. include budget fields only when requested

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    8bb3358 View commit details
    Browse the repository at this point in the history

  2. updated icons

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    780f2cd View commit details
    Browse the repository at this point in the history

  3. new budget fields in API

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    0babe87 View commit details
    Browse the repository at this point in the history

  4. fixed version

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    742be61 View commit details
    Browse the repository at this point in the history

  5. new permissions

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    4a6e9d7 View commit details
    Browse the repository at this point in the history

  6. code styles

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    b20dee9 View commit details
    Browse the repository at this point in the history

  7. fix user avatar icon in navbar

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    231ceb8 View commit details
    Browse the repository at this point in the history

  8. re-added files

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    d7cf8f7 View commit details
    Browse the repository at this point in the history

  9. fix tests

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    0a5dbb2 View commit details
    Browse the repository at this point in the history

  10. added tests

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    686196c View commit details
    Browse the repository at this point in the history

  11. tests

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    7aa0792 View commit details
    Browse the repository at this point in the history

  12. do not change method signature when overwriting

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    ea4a195 View commit details
    Browse the repository at this point in the history

  13. fixed duration formatter and added tests

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    d34a501 View commit details
    Browse the repository at this point in the history

  14. fix phpdoc

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    910cbbc View commit details
    Browse the repository at this point in the history

  15. removed unused methods

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    7e1ff69 View commit details
    Browse the repository at this point in the history

  16. prevent duplicate username and email in fixture

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    a651495 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' into budgets

    @kevinpapst
    kevinpapst committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    1d37534 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2019

  1. fixed progressbar for percents above 1000

    @kevinpapst
    kevinpapst committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    f9a9f3e View commit details
    Browse the repository at this point in the history