Code

Master#3

Code

Open

PatriciaXiao wants to merge 67 commits intomost-recent-changecs160-berkeley/Group-20-Project:most-recent-changefrom mastercs160-berkeley/Group-20-Project:masterCopy head branch name to clipboard

+1,352-489

Commits

Commits on Nov 10, 2016

• Merge branch 'most-recent-change'

  

  Patricia Xiao

  committed
  2cb40a7

• timing-hardware

  

  Patricia Xiao

  committed
  45988f0

• tiny bug fixed

  

  Patricia Xiao

  committed
  e2fd5e1

• bug fixed

  

  Patricia Xiao

  committed
  80e4e28

• tiny bug fixed

  

  Patricia Xiao

  committed
  6e9b466

• bug fixed & annotation added

  

  Patricia Xiao

  committed
  9ee9607

• what

  

  Patricia Xiao

  committed
  55d6bf4

• Revert "what"

  Show description for 78220e9
  

  Patricia Xiao

  committed
  78220e9

• bug fixed

  

  Patricia Xiao

  committed
  13caecf

• task 3 updated

  

  Patricia Xiao

  committed
  21dbe0d

• video updated

  

  Patricia Xiao

  committed
  7375e32

Commits on Nov 17, 2016

• parameter adapted

  

  Patricia Xiao

  committed
  510ba2b

Commits on Nov 18, 2016

• structure adapted

  

  Patricia Xiao

  committed
  72989e2

Commits on Nov 28, 2016

• Add files via upload

  Show description for 708edba
  jskwon

  authored
  708edba

Commits on Nov 30, 2016

• Revert "Add files via upload"

  Show description for 344a7aa
  

  Patricia Xiao

  committed
  344a7aa

• Revert "Revert "Add files via upload""

  Show description for 47ed878
  

  Patricia Xiao

  committed
  47ed878

• Revert "Revert "Revert "Add files via upload"""

  Show description for 48dbe2a
  

  Patricia Xiao

  committed
  48dbe2a

• Revert "Revert "Revert "Revert "Add files via upload""""

  Show description for a9801bd
  

  Patricia Xiao

  committed
  a9801bd

Commits on Dec 1, 2016

• read me updated

  

  Patricia Xiao

  committed
  a167fa0

• bug fixed

  

  Patricia Xiao

  committed
  eea44f8

• favorites page updated

  

  Patricia Xiao

  committed
  69399e5

• favorites page completed

  

  Patricia Xiao

  committed
  e6febc1

• tiny bugs fixed

  

  Patricia Xiao

  committed
  b4651a6

• parameter for latter use

  

  Patricia Xiao

  committed
  b8d7b17

• data updated

  

  Patricia Xiao

  committed
  ac8ca74

Commits on Dec 2, 2016

• tiny bug fixed & almost implemented settings

  

  Patricia Xiao

  committed
  e500fd9

• settings page implemented

  

  Patricia Xiao

  committed
  0f21e4f

• Add files via upload

  jskwon

  authored
  a4bf115

• notification page added

  

  Patricia Xiao

  committed
  66fb194

• notification layout done

  

  Patricia Xiao

  committed
  d829da6

• updating timing.js

  jackieg017

  committed
  06db623

• fixed merge conflict

  jackieg017

  committed
  01a2505

• Pins added

  

  Patricia Xiao

  committed
  2dbecd0

Commits on Dec 3, 2016

• Pins part done

  

  Patricia Xiao

  committed
  febd48e

• notification-interface

  

  Patricia Xiao

  committed
  b06ca7f

• layout bug fixed

  

  Patricia Xiao

  committed
  7590299

• Bug fixed

  

  Patricia Xiao

  committed
  3888399

• UNDO implemented

  

  Patricia Xiao

  committed
  6b18476

• bug fixed

  

  Patricia Xiao

  committed
  ae20763

• read-me update

  

  Patricia Xiao

  committed
  43aef16

• bugs fixed in readme

  

  Patricia Xiao

  committed
  824d75f

• interface updated

  Show description for 51aeb80
  

  Patricia Xiao

  committed
  51aeb80

• ReadMe Updated

  

  Patricia Xiao

  committed
  06fe5b0

• tiny bugs fixed

  

  Patricia Xiao

  committed
  9bf79c8

• image updated

  

  Patricia Xiao

  committed
  bbbf1eb

• ReadMe updated

  

  Patricia Xiao

  committed
  daacbcd

Commits on Dec 4, 2016

• finished timing, need to fix bug

  jackieg017

  committed
  87955fa

• fix merging error

  jackieg017

  committed
  30e8c81

• require -> request

  

  Patricia Xiao

  committed
  7697819

Commits on Dec 5, 2016

• finished timing and repeat feature

  jackieg017

  committed
  77cb630

• Merge branch 'master' of https://github.com/cs160-berkeley/Group-20-Project

  jackieg017

  committed
  32f5f7f

Commits on Dec 6, 2016

• Added Mohan's changes & fingerprinting

  jonyachen

  committed
  264f8c0

• Added moan's changes

  jonyachen

  committed
  06fb00c

• Fixed fingerprint icon looking weird

  jonyachen

  committed
  b2ee0fd

• FIXED!!

  jonyachen

  committed
  0095e08

Commits on Dec 9, 2016

• ready

  

  Patricia Xiao

  committed
  24e3563

• readme

  

  Patricia Xiao

  committed
  5780ca9

• readme bug fixed

  

  Patricia Xiao

  committed
  ce2dec9

• bug fixed

  

  Patricia Xiao

  committed
  f0565d6

• bug

  

  Patricia Xiao

  committed
  5dff96c

• ReadMe images added

  

  Patricia Xiao

  committed
  c2eb5f6

• bug fixed

  

  Patricia Xiao

  committed
  039e0ec

• bug fixed

  

  Patricia Xiao

  committed
  a58d246

• ReadMe completed

  

  Patricia Xiao

  committed
  ac062c7

Commits on Dec 13, 2016

• report & video added

  

  Patricia Xiao

  committed
  0a7a944

• bug fixed

  

  Patricia Xiao

  committed
  7cd37b5

• bug fixed

  

  Patricia Xiao

  committed
  6f38af6