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

Ac klok import #193

Merged
merged 12 commits into from
Aug 9, 2016
Merged

Ac klok import #193

merged 12 commits into from
Aug 9, 2016

Commits on Jul 7, 2016

  1. first iteration of klok import script

    @amcates
    amcates committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    c710651 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2016

  1. changing to use name instead of comments for components per Wenjun [#… 

    …#125644861]
    @amcates
    amcates committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    89edeba View commit details
    Browse the repository at this point in the history

  2. testing PT integration [#125644861]

    @amcates
    amcates committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    e76dc5e View commit details
    Browse the repository at this point in the history

  3. klok schema

    @amcates
    amcates committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    0f4f715 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ac-klok-import' of github.com:sparc-request/sparc-fulfi… 

    …llment into ac-klok-import
    @amcates
    amcates committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    8fc706d View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2016

  1. fixing issues with klok import [#125644861]

    @amcates
    amcates committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    d365067 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ac-klok-import

    @amcates
    amcates committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    19e334a View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2016

  1. additional klok changes, adding icon, fix to spreadsheet, date sorter… 

    … [#125644861]
    @amcates
    amcates committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    23bfd80 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2016

  1. Merge branch 'master' into ac-klok-import

    @amcates
    amcates committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    087c569 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2016

  1. Update 20160707010804_add_klok_entry_id_to_line_items.rb

    @amcates
    amcates committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    7ca4765 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2016

  1. Merge branch 'master' into ac-klok-import

    @amcates
    amcates committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    d320640 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2016

  1. Merge branch 'master' into ac-klok-import

    @amcates
    amcates committed Aug 3, 2016
    Configuration menu
    Copy the full SHA
    5327df2 View commit details
    Browse the repository at this point in the history