Code

Merge from develop#9

Code

Open

s13261 wants to merge 52 commits intomwsobol:developmwsobol/SORCER:developfrom s13372:masters13372/SORCER:masterCopy head branch name to clipboard

+8,851-317

Commits

Commits on Dec 23, 2015

• bumped to 5.3.21

  mwsobol

  committed
  2d10e02

  Copy full SHA for 2d10e02

• Merge branch 'develop' of github.com:mwsobol/SORCER into develop

  mwsobol

  committed
  8f84382

  Copy full SHA for 8f84382

• bumped to 5.3.22

  mwsobol

  committed
  91cc368

  Copy full SHA for 91cc368

Commits on Dec 25, 2015

• Merge branch develop

  mwsobol

  committed
  b056652

  Copy full SHA for b056652

Commits on Jan 16, 2016

• bumped to 5.3.25

  mwsobol

  committed
  9ca88fd

  Copy full SHA for 9ca88fd

Commits on Jan 20, 2016

• added folder USERS

  s13372

  committed
  b184550

  Copy full SHA for b184550

• Revert "added folder USERS"

  Show description for e0ed001
  s13372

  committed
  e0ed001

  Copy full SHA for e0ed001

• Added Users Folder and s13372 user folder

  s13372

  committed
  96dfb8a

  Copy full SHA for 96dfb8a

• test

  s13372

  committed
  96f5c7c

  Copy full SHA for 96f5c7c

• test

  SebastianStark7

  committed
  bea3e72

  Copy full SHA for bea3e72

• s13372 UC Description

  s13372

  committed
  bde415e

  Copy full SHA for bde415e

• added UML and 4blocker

  s13372

  committed
  0b3eddb

  Copy full SHA for 0b3eddb

• HW1 s14435

  SebastianStark7

  committed
  30d1120

  Copy full SHA for 30d1120

• s13353

  

  s13353

  committed
  b598783

  Copy full SHA for b598783

• s13353 description commit

  

  s13353

  committed
  2ed6caf

  Copy full SHA for 2ed6caf

• HM1

  s13261

  committed
  5412cd7

  Copy full SHA for 5412cd7

• Merge branch 'master' of https://github.com/s13372/SORCER

  

  s13353

  committed
  a0fea01

  Copy full SHA for a0fea01

• s13353 description commit2

  

  s13353

  committed
  35e3ac5

  Copy full SHA for 35e3ac5

• merge delted file

  s13372

  committed
  b0e8c4d

  Copy full SHA for b0e8c4d

• s13353_2

  

  s13353

  committed
  656f173

  Copy full SHA for 656f173

Commits on Jan 21, 2016

• Recipe class documentation fix

  s13372

  committed
  f288fc3

  Copy full SHA for f288fc3

• s13353_getAmtSugar, setAmtSugar, getName

  

  s13353

  committed
  0680fd0

  Copy full SHA for 0680fd0

Commits on Jan 22, 2016

• HW2_s14435

  

  s13353

  committed
  9f1a57e

  Copy full SHA for 9f1a57e

• 2 method edit with javadoc

  s13261

  committed
  bcd26a6

  Copy full SHA for bcd26a6

• some change

  s13261

  committed
  8fbfb38

  Copy full SHA for 8fbfb38

• some change1

  s13261

  committed
  259bce9

  Copy full SHA for 259bce9

• Final check and fix

  s13372

  committed
  3689bc7

  Copy full SHA for 3689bc7

• javadoc generated

  s13372

  committed
  7f205ad

  Copy full SHA for 7f205ad

• s13372_UC3_Analysis and Design

  s13372

  committed
  4c289c5

  Copy full SHA for 4c289c5

• s13372_UC3_Analysis and Design

  s13372

  committed
  cec4bf2

  Copy full SHA for cec4bf2

• SDiag2

  SebastianStark7

  committed
  d85145e

  Copy full SHA for d85145e

• zadanie_2_czesc1

  

  s13353

  committed
  dd5980e

  Copy full SHA for dd5980e

• zadanie2

  

  s13353

  committed
  25eadd3

  Copy full SHA for 25eadd3

Commits on Jan 25, 2016

• s13353_Tests

  

  s13353

  committed
  29369a2

  Copy full SHA for 29369a2

• s14435_Sebastian

  SebastianStark7

  committed
  def038f

  Copy full SHA for def038f

• Merge remote-tracking branch 'origin/master'

  

  s13353

  committed
  87e38a4

  Copy full SHA for 87e38a4

• s13353_Tests(C2)

  

  s13353

  committed
  f5bcad9

  Copy full SHA for f5bcad9

• Added unit test for addRecipe ana deleteRecipe, bug checked and corrected.

  s13261

  committed
  ef7a292

  Copy full SHA for ef7a292

• Merge remote-tracking branch 'origin/master'

  s13261

  committed
  048800c

  Copy full SHA for 048800c

• Merge remote-tracking branch 'origin/master'

  

  s13353

  committed
  484d59f

  Copy full SHA for 484d59f

• s13353_Tests3

  

  s13353

  committed
  b418bed

  Copy full SHA for b418bed

• s13353_Tests

  

  s13353

  committed
  b16fa4d

  Copy full SHA for b16fa4d

• final fix

  Show description for 8b961c9
  s13372

  committed
  8b961c9

  Copy full SHA for 8b961c9

Commits on Jan 28, 2016

• Added unit test for addRecipe ana deleteRecipe, bug checked and corrected.

  s13261

  committed
  e97ac70

  Copy full SHA for e97ac70

Commits on Jan 29, 2016

• Scanner service v1

  s13261

  committed
  7159a3b

  Copy full SHA for 7159a3b

• Merge remote-tracking branch 'origin/develop'

  Show description for aab75bd
  s13261

  committed
  aab75bd

  Copy full SHA for aab75bd

• Merge remote-tracking branch 'refs/remotes/mwsobol/develop'

  Show description for b468d34
  s13372

  committed
  b468d34

  Copy full SHA for b468d34

• Merge remote-tracking branch 'origin/master'

  Show description for f2405ed
  s13261

  committed
  f2405ed

  Copy full SHA for f2405ed

• tests

  s13261

  committed
  552f5a9

  Copy full SHA for 552f5a9

• netlet

  s13261

  committed
  31a926b

  Copy full SHA for 31a926b

• created folder for project artifacts

  s13372

  committed
  ccf487c

  Copy full SHA for ccf487c

Commits on Jan 30, 2016

• presentation .ppt

  s13372

  committed
  66c4a23

  Copy full SHA for 66c4a23