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

merge activity #287

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

merge activity #287

wants to merge 5 commits into from

Commits on Jul 9, 2015

  1. added class capable of merging 2 records

    @dhiltonp
    dhiltonp committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    23a14ce View commit details
    Browse the repository at this point in the history

  2. moved ActivityMerger to the correct directory

    @dhiltonp
    dhiltonp committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    cb1817b View commit details
    Browse the repository at this point in the history

  3. ActivityMerger now updates all 3 tables related to activities

    @dhiltonp
    dhiltonp committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    c27ead6 View commit details
    Browse the repository at this point in the history

  4. replaced recompute activity menu option with merge activity option

    @dhiltonp
    dhiltonp committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    8759d88 View commit details
    Browse the repository at this point in the history

  5. ActivityMerger should now be reentrant.

    @dhiltonp
    dhiltonp committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    b8cb4da View commit details
    Browse the repository at this point in the history