Code

Back Merge Master#411

Code

Merged

codyseibert merged 14 commits intostagingflexion/ef-cms:stagingfrom task/back_merge_masterflexion/ef-cms:task/back_merge_masterCopy head branch name to clipboardDec 19, 2018

+695-412

Commits

Commits on Nov 30, 2018

• Merge pull request #249 from flexion/staging

  Show description for bb320ed
  codyseibert

  authored
  bb320ed

Commits on Dec 3, 2018

• fixing bug where the docker container can not connect to the service when using localhost

  codyseibert

  committed
  61aa9cd

• Merge pull request #254 from flexion/task/fixing_host_bug

  Show description for 967aacb
  sadlerw

  authored
  967aacb

Commits on Dec 6, 2018

• addressing a lot of the PR comments of the sprint 3 PR

  codyseibert

  committed
  f07c118

Commits on Dec 7, 2018

• ability to stop container with ctrl c

  codyseibert

  committed
  b2abdc5

• change license

  codyseibert

  committed
  ed51fc3

• Merge pull request #272 from flexion/task/addressing_sprint_3_pr_comments

  Show description for 96c47ab
  codyseibert

  authored
  96c47ab

• adding css to fix the pipe issue

  codyseibert

  committed
  641008a

• fixing lint issue

  codyseibert

  committed
  49820e5

• Merge pull request #275 from flexion/task/addressing_sprint_3_pr_pipe_bug

  Show description for 6209bec
  codyseibert

  authored
  6209bec

Commits on Dec 19, 2018

• fixing package json files

  codyseibert

  committed
  abcd99e

• Merge branch 'master' into task/back_merge_master

  codyseibert

  committed
  8a1f069

• fixing package lock

  codyseibert

  committed
  0a9f3c8

• adding back package-lock

  codyseibert

  committed
  679abad