Code

Jiayu#76

Code

Open

ZhangJiayu0303 wants to merge 89 commits intonus-cs2103-AY1819S2:masternus-cs2103-AY1819S2/addressbook-level4:masterfrom CS2103-AY1819S2-W16-3:JiayuCS2103-AY1819S2-W16-3/main:JiayuCopy head branch name to clipboard

+1,290-137

Commits

Commits on Feb 8, 2019

• Set theme jekyll-theme-cayman

  roanurquhart

  committed
  bdfe645

Commits on Feb 19, 2019

• Updated about us

  jkhiani

  committed
  1fbc356

• Fixed image extension

  jkhiani

  committed
  4c0f8f7

• Updated about us

  FanDongzhe

  committed
  261def4

• Merge branch 'master' of https://github.com/cs2103-ay1819s2-w16-3/main

  jkhiani

  committed
  4b97a8d

• Add profile picture and update my info in AboutUs

  ZhangJiayu0303

  committed
  7252c31

• Merge pull request #1 from ZhangJiayu0303/master

  Show description for d7d8879
  ZhangJiayu0303

  authored
  d7d8879

• Update AboutUs.adoc

  FanDongzhe

  authored
  f18c8dc

• Update AboutUs.adoc

  FanDongzhe

  authored
  8bd1064

• Update README.adoc

  FanDongzhe

  authored
  35bb2d5

• Merge pull request #1 from cs2103-ay1819s2-w16-3/master

  Show description for 7d216fb
  roanurquhart

  authored
  7d216fb

• Update AboutUs.adoc

  roanurquhart

  authored
  2e90128

• Added roanurquhart image

  roanurquhart

  committed
  0a4facc

• Updated GUI image

  roanurquhart

  committed
  c201c0b

• Merge pull request #3 from roanurquhart/master

  Show description for 1799a69
  roanurquhart

  authored
  1799a69

• Merge pull request #2 from cs2103-ay1819s2-w16-3/master

  Show description for 0d56fe6
  roanurquhart

  authored
  0d56fe6

• Commented out Travis

  roanurquhart

  authored
  74981d3

• Commented out Travis

  roanurquhart

  authored
  66f5151

• Deleted Travis

  roanurquhart

  authored
  2e1c61b

• Updated ReadMe

  roanurquhart

  committed
  b906cfb

• Merge pull request #4 from roanurquhart/master

  Show description for a384a3f
  roanurquhart

  authored
  a384a3f

• Merge branch 'master' into FanDongzhe-patch-1

  roanurquhart

  authored
  c650334

• Merge pull request #2 from cs2103-ay1819s2-w16-3/FanDongzhe-patch-1

  Show description for 69af1e0
  roanurquhart

  authored
  69af1e0

• Merge pull request #3 from cs2103-ay1819s2-w16-3/master

  Show description for a6d081a
  roanurquhart

  authored
  a6d081a

• Update AboutUs.adoc

  FanDongzhe

  authored
  48892ce

• Update UserGuide.adoc

  FanDongzhe

  authored
  e7651d3

• Update UserGuide.adoc

  FanDongzhe

  authored
  9850a2c

• Update UserGuide.adoc

  FanDongzhe

  authored
  be0418b

• Update UserGuide.adoc

  FanDongzhe

  authored
  6101699

• Update UserGuide.adoc

  FanDongzhe

  authored
  4eaaa8a

• Update UserGuide.adoc

  FanDongzhe

  authored
  5699ad3

• Update UserGuide.adoc

  FanDongzhe

  authored
  2b10e2f

• Update UserGuide.adoc

  FanDongzhe

  authored
  eb1241e

• Update UserGuide.adoc

  FanDongzhe

  authored
  bcec2c1

• Update UserGuide.adoc

  FanDongzhe

  authored
  7cd108a

• Merge pull request #5 from FanDongzhe/master

  Show description for c95674a
  FanDongzhe

  authored
  c95674a

Commits on Feb 20, 2019

• Updated picture for roan

  jkhiani

  committed
  a892027

• Updated to png

  jkhiani

  committed
  bca7724

• Updated AboutUs

  jkhiani

  committed
  022580d

• Update AboutUs

  jkhiani

  authored
  d0d6f98

• Merge pull request #7 from jkhiani/master

  Show description for 7797d53
  jkhiani

  authored
  7797d53

Commits on Feb 21, 2019

• Added colors to tags

  jkhiani

  committed
  c464a91

• Merge pull request #8 from jkhiani/master

  Show description for 756bb1d
  jkhiani

  authored
  756bb1d

Commits on Feb 23, 2019

• Merge pull request #4 from cs2103-ay1819s2-w16-3/master

  Show description for b1e62b1
  roanurquhart

  authored
  b1e62b1

• Added help alias command

  roanurquhart

  committed
  6724783

• Merge pull request #9 from roanurquhart/master

  Show description for 515ec8c
  roanurquhart

  authored
  515ec8c

Commits on Mar 3, 2019

• Merge pull request #5 from cs2103-ay1819s2-w16-3/master

  Show description for 30db166
  roanurquhart

  authored
  30db166

Commits on Mar 4, 2019

• Added FavoriteCommand

  Show description for c04f622
  roanurquhart

  committed
  c04f622

• Merge pull request #10 from roanurquhart/master

  Show description for 7c49c8d
  roanurquhart

  authored
  7c49c8d

Commits on Mar 5, 2019

• Merge pull request #1 from cs2103-ay1819s2-w16-3/master

  Show description for 16eb9ef
  jkhiani

  authored
  16eb9ef

• When person card is clicked, address shows up on google map

  jkhiani

  committed
  0f5be8e

• Merge pull request #11 from jkhiani/master

  Show description for f539495
  jkhiani

  authored
  f539495

• Merge branch 'master' into master

  roanurquhart

  authored
  dafa23e

• Removed trailing whitespace

  jkhiani

  authored
  6511688

• Removed trailing whitespace on line 35

  jkhiani

  authored
  1419b49

• Merge pull request #6 from cs2103-ay1819s2-w16-3/master

  Show description for eb1d190
  roanurquhart

  authored
  eb1d190

• Updated file from jpeg to png

  roanurquhart

  committed
  f29a48d

• Merge pull request #12 from roanurquhart/master

  Show description for 3615398
  roanurquhart

  authored
  3615398

• Fixed Java Code Convention issues

  roanurquhart

  committed
  ff69f48

• Merge pull request #13 from roanurquhart/master

  Show description for 3570e20
  roanurquhart

  authored
  3570e20

• Merge pull request #7 from cs2103-ay1819s2-w16-3/master

  Show description for 1bc5453
  roanurquhart

  authored
  1bc5453

• Fixed further convention issues

  roanurquhart

  committed
  f3625ff

• Merge pull request #14 from roanurquhart/master

  Show description for d32a2d3
  roanurquhart

  authored
  d32a2d3

• Merge pull request #2 from cs2103-ay1819s2-w16-3/master

  Show description for f75e70c
  jkhiani

  authored
  f75e70c

• Fixed test

  jkhiani

  committed
  94dfe1e

• Merge pull request #15 from jkhiani/master

  Show description for a253384
  jkhiani

  authored
  a253384

• Merge pull request #8 from cs2103-ay1819s2-w16-3/master

  Show description for 1c0616e
  roanurquhart

  authored
  1c0616e

• Revert "Fixed further convention issues"

  jkhiani

  authored
  6e75b12

• Merge pull request #16 from cs2103-ay1819s2-w16-3/revert-14-master

  Show description for 070da8d
  jkhiani

  authored
  070da8d

• Merge pull request #9 from cs2103-ay1819s2-w16-3/master

  Show description for e600a86
  roanurquhart

  authored
  e600a86

• Fixed CI test issues after revert

  roanurquhart

  committed
  faac416

• Merge pull request #17 from roanurquhart/master

  Show description for 7a17474
  roanurquhart

  authored
  7a17474

• Attempted to fix Travis CI test failures

  roanurquhart

  committed
  194fe9e

• Merge pull request #18 from roanurquhart/master

  Show description for f936862
  roanurquhart

  authored
  f936862

• Merge pull request #10 from cs2103-ay1819s2-w16-3/master

  Show description for bd97beb
  roanurquhart

  authored
  bd97beb

• Fixed tests temporarily

  roanurquhart

  committed
  d2d1cf3

• Updated with favorite command

  roanurquhart

  authored
  9189144

• Merge pull request #19 from roanurquhart/master

  Show description for 0d86218
  roanurquhart

  authored
  0d86218

• Reset tests

  roanurquhart

  committed
  313bc74

• Merge pull request #20 from roanurquhart/master

  Show description for 11a1531
  roanurquhart

  authored
  11a1531

• reset link

  roanurquhart

  committed
  0c0f0ed

• Merge pull request #21 from roanurquhart/master

  Show description for f64b8db
  roanurquhart

  authored
  f64b8db

• Updated docs

  roanurquhart

  authored
  3d1e8ba

• Store personal salary/occupation/relationship status in addCommand.

  ZhangJiayu0303

  committed
  3f66090

• Merge pull request #22 from ZhangJiayu0303/master

  Show description for 65b598e
  ZhangJiayu0303

  authored
  65b598e

Commits on Mar 16, 2019

• add "Salary", "Occupation", "Relationship" to personal information.

  ZhangJiayu0303

  committed
  68872f6

• Merge pull request #36 from ZhangJiayu0303/master

  Show description for b7c56cf
  ZhangJiayu0303

  authored
  b7c56cf

• enhance the Ui image

  ZhangJiayu0303

  committed
  dff5923

• Merge pull request #37 from ZhangJiayu0303/master

  Show description for 1087850
  ZhangJiayu0303

  authored
  1087850