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

Commit #125 #40

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

Commit #125 #40

wants to merge 24 commits into from

Commits on May 2, 2018

  1. Added Goal Achievement Popups Checkboxes required for Goal completion… 

    … and number of goals missed and goals completed to be displayed
    @PRISHIta123
    PRISHIta123 committed May 2, 2018
    Configuration menu
    Copy the full SHA
    23ca4c0 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2018

  1. Resolved Conflicts in local.properties

    @PRISHIta123
    PRISHIta123 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    21d3af8 View commit details
    Browse the repository at this point in the history

  2. Resolved Conflicts

    @PRISHIta123
    PRISHIta123 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    e0cfa76 View commit details
    Browse the repository at this point in the history

  3. Resolved merge conflicts

    @PRISHIta123
    PRISHIta123 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    6c85e5a View commit details
    Browse the repository at this point in the history

  4. Added google-services.json file that was removed

    @PRISHIta123
    PRISHIta123 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    0638372 View commit details
    Browse the repository at this point in the history

  5. Update google-services.json

    @PRISHIta123
    PRISHIta123 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    51f14be View commit details
    Browse the repository at this point in the history

  6. Changed username in google-services.json file

    @PRISHIta123
    PRISHIta123 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    b961691 View commit details
    Browse the repository at this point in the history

  7. Changed username in google-services.json to resolve conflict

    @PRISHIta123
    PRISHIta123 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    4132447 View commit details
    Browse the repository at this point in the history

  8. Added Caches folder to .idea

    @PRISHIta123
    PRISHIta123 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    a08a175 View commit details
    Browse the repository at this point in the history

  9. Added codeStyles folder to .idea

    @PRISHIta123
    PRISHIta123 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    7f17852 View commit details
    Browse the repository at this point in the history

  10. Updates misc.xml

    @PRISHIta123
    PRISHIta123 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    e0b44df View commit details
    Browse the repository at this point in the history

Commits on May 12, 2018

  1. Update local.properties

    @PRISHIta123
    PRISHIta123 committed May 12, 2018
    Configuration menu
    Copy the full SHA
    d4adf39 View commit details
    Browse the repository at this point in the history

  2. Update google-services.json

    @PRISHIta123
    PRISHIta123 committed May 12, 2018
    Configuration menu
    Copy the full SHA
    5c7f11e View commit details
    Browse the repository at this point in the history

  3. Added files for Opening windows for each Activity , Goals completed V… 

    …alue to be updated at each click
    @PRISHIta123
    PRISHIta123 committed May 12, 2018
    Configuration menu
    Copy the full SHA
    5a8c3ea View commit details
    Browse the repository at this point in the history

  4. Modified misc.xml and local.properties

    @PRISHIta123
    PRISHIta123 committed May 12, 2018
    Configuration menu
    Copy the full SHA
    f4017d1 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2018

  1. Removed conflicting file

    @PRISHIta123
    PRISHIta123 committed May 14, 2018
    Configuration menu
    Copy the full SHA
    4d46ac2 View commit details
    Browse the repository at this point in the history

  2. Added build_file checksums.ser

    @PRISHIta123
    PRISHIta123 committed May 14, 2018
    Configuration menu
    Copy the full SHA
    b7b3883 View commit details
    Browse the repository at this point in the history

  3. Modified AndroidManifest.xml

    @PRISHIta123
    PRISHIta123 committed May 14, 2018
    Configuration menu
    Copy the full SHA
    dd66f2f View commit details
    Browse the repository at this point in the history

  4. Removed conflicting file

    @PRISHIta123
    PRISHIta123 committed May 14, 2018
    Configuration menu
    Copy the full SHA
    66954c1 View commit details
    Browse the repository at this point in the history

  5. Added file

    @PRISHIta123
    PRISHIta123 committed May 14, 2018
    Configuration menu
    Copy the full SHA
    dbc89be View commit details
    Browse the repository at this point in the history

  6. Removed file

    @PRISHIta123
    PRISHIta123 committed May 14, 2018
    Configuration menu
    Copy the full SHA
    7cba73e View commit details
    Browse the repository at this point in the history

  7. Added file

    @PRISHIta123
    PRISHIta123 committed May 14, 2018
    Configuration menu
    Copy the full SHA
    47a9d71 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into master

    @PRISHIta123
    PRISHIta123 committed May 14, 2018
    Configuration menu
    Copy the full SHA
    74f7a1e View commit details
    Browse the repository at this point in the history

Commits on May 15, 2018

  1. Merge branch 'master' into master

    @PRISHIta123
    PRISHIta123 committed May 15, 2018
    Configuration menu
    Copy the full SHA
    c61f523 View commit details
    Browse the repository at this point in the history