Code

Commit #125#40

Code

Open

PRISHIta123 wants to merge 24 commits intoUdacityAndroidBasicsScholarship:masterUdacityAndroidBasicsScholarship/daily-goals:masterfrom PRISHIta123:masterPRISHIta123/daily-goals:masterCopy head branch name to clipboard

+416-37

Commits

Commits on May 2, 2018

• Added Goal Achievement Popups Checkboxes required for Goal completion and number of goals missed and goals completed to be displayed

  PRISHIta123

  committed
  23ca4c0

Commits on May 11, 2018

• Resolved Conflicts in local.properties

  PRISHIta123

  authored
  21d3af8

• Resolved Conflicts

  PRISHIta123

  committed
  e0cfa76

• Resolved merge conflicts

  PRISHIta123

  committed
  6c85e5a

• Added google-services.json file that was removed

  PRISHIta123

  committed
  0638372

• Update google-services.json

  PRISHIta123

  authored
  51f14be

• Changed username in google-services.json file

  PRISHIta123

  committed
  b961691

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

  PRISHIta123

  committed
  4132447

• Added Caches folder to .idea

  PRISHIta123

  committed
  a08a175

• Added codeStyles folder to .idea

  PRISHIta123

  committed
  7f17852

• Updates misc.xml

  PRISHIta123

  authored
  e0b44df

Commits on May 12, 2018

• Update local.properties

  PRISHIta123

  authored
  d4adf39

• Update google-services.json

  PRISHIta123

  authored
  5c7f11e

• Added files for Opening windows for each Activity , Goals completed Value to be updated at each click

  PRISHIta123

  committed
  5a8c3ea

• Modified misc.xml and local.properties

  PRISHIta123

  committed
  f4017d1

Commits on May 14, 2018

• Removed conflicting file

  PRISHIta123

  committed
  4d46ac2

• Added build_file checksums.ser

  PRISHIta123

  committed
  b7b3883

• Modified AndroidManifest.xml

  PRISHIta123

  committed
  dd66f2f

• Removed conflicting file

  PRISHIta123

  committed
  66954c1

• Added file

  PRISHIta123

  committed
  dbc89be

• Removed file

  PRISHIta123

  committed
  7cba73e

• Added file

  PRISHIta123

  committed
  47a9d71

• Merge branch 'master' into master

  PRISHIta123

  authored
  74f7a1e

Commits on May 15, 2018

• Merge branch 'master' into master

  PRISHIta123

  authored
  c61f523