Team#11

Open

yeli7289 wants to merge 192 commits intoucdd2016:masterfrom

Commits on Jan 16, 2016

yen-teh liu individual resume

Liuyen-teh
authored and
Liuyen-teh
committed
yenteh liu homework

Liuyen-teh
authored and
Liuyen-teh
committed
yenteh liu homework

Liuyen-teh
authored and
Liuyen-teh
committed

Commits on Jan 20, 2016

resubmit homework 1

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Hackathon_week1

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Hackathon_week1_revise

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Hackathon_week1_revise

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Hackathon_week1_revise

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Jan 25, 2016

week2_individual

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Feb 1, 2016

week 3 individual

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
fix version of team homework code

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge remote-tracking branch 'upstream/master'

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Feb 5, 2016

react work

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Feb 6, 2016

individual week 4

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Feb 9, 2016

admin mock

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Feb 15, 2016

week 5 individual

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Feb 17, 2016

..

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Feb 21, 2016

week6 together individual

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Feb 24, 2016

wrrk7 proposal

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
week7 proposal

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
revise

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #1 from yeli7289/team
Yen-Teh Liu
committed

Commits on Feb 26, 2016

build initial react framework
sophyzhou
committed
Merge branch 'team' of github.com:yeli7289/book into team
sophyzhou
committed
add react js,css and other boring stuff
sophyzhou
committed
add beautiful images
sophyzhou
committed
make slides
sophyzhou
committed
small change
sophyzhou
committed
map is almost doen
sophyzhou
committed

Commits on Feb 27, 2016

small change layout
sophyzhou
committed
add ads,forgive me.I really love this ads video:)

sophyzhou
authored and
sophyzhou
committed
add ads

sophyzhou
authored and
sophyzhou
committed
add ads.
lantian1989
committed
..

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Feb 28, 2016

week 7 individual

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #2 from yeli7289/team
Yen-Teh Liu
committed
week7 individual

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
startCanvas
SerendpityZOEY
committed
AddSearch
SerendpityZOEY
committed
add parallax
SerendpityZOEY
committed

Commits on Feb 29, 2016

add page advertise popular cities
SerendpityZOEY
committed
add to popular
SerendpityZOEY
committed
small change
SerendpityZOEY
committed
chat room added

sophyzhou
authored and
sophyzhou
committed
chat room added

sophyzhou
authored and
sophyzhou
committed
Merge pull request #3 from yeli7289/team
Yen-Teh Liu
committed
mute with close ads
sophyzhou
committed

Commits on Mar 1, 2016

BDD in class

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #4 from yeli7289/master
Yen-Teh Liu
committed
..

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
hackthon
sophyzhou
committed
bdd

sophyzhou
authored and
sophyzhou
committed
Merge pull request #5 from yeli7289/team
Yen-Teh Liu
committed

Commits on Mar 2, 2016

Database Structure

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #6 from yeli7289/master
Yen-Teh Liu
committed
Firebas Structure

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #7 from yeli7289/master
Yen-Teh Liu
committed
..

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #9 from yeli7289/team
Yen-Teh Liu
committed

Commits on Mar 3, 2016

update
SerendpityZOEY
committed
update
SerendpityZOEY
committed
Merge pull request #10 from yeli7289/team
Yen-Teh Liu
committed
Tommy Milestone1

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #11 from yeli7289/master
Yen-Teh Liu
committed
action1
SerendpityZOEY
committed
action2
SerendpityZOEY
committed
Added acitons click on map and post a message
rishabkanwal
committed
Merge pull request #12 from yeli7289/team
rishabkanwal
committed
action2
SerendpityZOEY
committed
action2
SerendpityZOEY
committed
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY
committed
Yun edit

sophyzhou
authored and
sophyzhou
committed
Yun edit

sophyzhou
authored and
sophyzhou
committed
action2
SerendpityZOEY
committed
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY
committed
fixconflict
SerendpityZOEY
committed
fixconflict
SerendpityZOEY
committed
Merge pull request #13 from yeli7289/master
Yen-Teh Liu
committed
Merge pull request #14 from yeli7289/team
Yen-Teh Liu
committed
Team Milstone1

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #15 from yeli7289/master
Yen-Teh Liu
committed
modifycanvas
SerendpityZOEY
committed
modifycanvas
SerendpityZOEY
committed
modifycanvas
SerendpityZOEY
committed

Commits on Mar 5, 2016

week8 team

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
week8 Milestone2

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
week8 Milestone2

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #16 from yeli7289/team
Yen-Teh Liu
committed
Merge pull request #17 from yeli7289/master
Yen-Teh Liu
committed
modifyStatus
SerendpityZOEY
committed
modifyStatus
SerendpityZOEY
committed
modifyStatus
SerendpityZOEY
committed
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY
committed

Commits on Mar 6, 2016

modifycanvas
SerendpityZOEY
committed
startMultipleLayers
SerendpityZOEY
committed
update 3

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
simulator
sophyzhou
committed
simulator_yun
sophyzhou
committed
Delete simulate-users2.js
lantian1989
committed
canvas
SerendpityZOEY
committed
fixconflict
SerendpityZOEY
committed
canvassimulate
SerendpityZOEY
committed
1
sophyzhou
committed
chat simulator
sophyzhou
committed
canvassimulate
SerendpityZOEY
committed
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY
committed
fffr

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
addRemove to refresh canvas
SerendpityZOEY
committed
333

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
semi-final

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
week8

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
week8 except ClickOnMap

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
week8

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
week8

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
week8 re

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Mar 7, 2016

Implemented map click simulation
rishabkanwal
committed
milestone

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
week8 milestone

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #19 from yeli7289/team
Yen-Teh Liu
committed
Merge pull request #18 from yeli7289/master
Yen-Teh Liu
committed
Merge pull request #20 from yeli7289/team
Yen-Teh Liu
committed
milestone 3

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
week8 milestone 3

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #21 from yeli7289/master
Yen-Teh Liu
committed

Commits on Mar 10, 2016

move html files (for react.js form)

sophyzhou
authored and
sophyzhou
committed

Commits on Mar 13, 2016

add chatroom component

sophyzhou
authored and
sophyzhou
committed
startreact
SerendpityZOEY
committed
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY
committed
login
SerendpityZOEY
committed
stash

sophyzhou
authored and
sophyzhou
committed
Tommy week9

Yen-Teh Liu
authored and
Yen-Teh Liu
committed

Commits on Mar 14, 2016

change from Yun

sophyzhou
authored and
sophyzhou
committed
changes

sophyzhou
authored and
sophyzhou
committed
change simulator

sophyzhou
authored and
sophyzhou
committed
chatrrom bug solved

sophyzhou
authored and
sophyzhou
committed
Finished Week 9
rishabkanwal
committed
Merge pull request #22 from yeli7289/team
rishabkanwal
committed
modify simulate and canvas in html
SerendpityZOEY
committed
fix conflict
SerendpityZOEY
committed
tommy done

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
tommy done

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
tommy done

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
Merge pull request #23 from yeli7289/team
Yen-Teh Liu
committed
changeLayout
SerendpityZOEY
committed
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY
committed
modifyLayout
SerendpityZOEY
committed
small changes
SerendpityZOEY
committed
Merge pull request #24 from yeli7289/team
Yen-Teh Liu
committed

Commits on Mar 17, 2016

smallchanges
SerendpityZOEY
committed

Commits on Mar 20, 2016

Commits on Mar 23, 2016

modify
SerendpityZOEY
committed
week10

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
move canvas to react
SerendpityZOEY
committed
fixconflict
SerendpityZOEY
committed
chatroom need to be debugged

sophyzhou
authored and
sophyzhou
committed
1

sophyzhou
authored and
sophyzhou
committed

Commits on Mar 24, 2016

chatroom basic

sophyzhou
authored and
sophyzhou
committed
..

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
chatroom intermediate

sophyzhou
authored and
sophyzhou
committed

Commits on Mar 25, 2016

almost done version

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
almost done version

Yen-Teh Liu
authored and
Yen-Teh Liu
committed
changelayout
SerendpityZOEY
committed

Commits on Mar 26, 2016

add canvas to diff group
SerendpityZOEY
committed
Delete popular.html
SerendpityZOEY
committed
Delete googlemaps.js
SerendpityZOEY
committed
Merge remote-tracking branch 'origin' into team
SerendpityZOEY
committed
modify action
SerendpityZOEY
committed
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY
committed
move to action
SerendpityZOEY
committed
move to action
SerendpityZOEY
committed
canvas done
SerendpityZOEY
committed
merge

sophyzhou
authored and
sophyzhou
committed
Merge branch 'team' of github.com:yeli7289/book into team

sophyzhou
authored and
sophyzhou
committed

Commits on Mar 29, 2016

Delete chat.html
lantian1989
committed
change the ugly layout

sophyzhou
authored and
sophyzhou
committed
Merge branch 'team' of github.com:yeli7289/book into team

sophyzhou
authored and
sophyzhou
committed
fix a lot of bugs

sophyzhou
authored and
sophyzhou
committed

Commits on Apr 3, 2016

format

sophyzhou
authored and
sophyzhou
committed
format and btn

sophyzhou
authored and
sophyzhou
committed
format

sophyzhou
authored and
sophyzhou
committed
bugs

sophyzhou
authored and
sophyzhou
committed