Code

Develop#7

Code

Open

yultreuse wants to merge 11 commits intoBrewPi:developBrewPi/brewpi-www:developfrom yultreuse:developyultreuse/brewpi-www:developCopy head branch name to clipboard

+5,163-21

Commits

Commits on Jun 26, 2013

• Add login feature to BrewPi, to allow full read only access from the www and editing/control actions reserved to logged in users

  

  Julien Mottin

  committed
  d43898c

  Copy full SHA for d43898c

• merge with elco's develop branch

  

  Julien Mottin

  committed
  33057c2

  Copy full SHA for 33057c2

Commits on Nov 27, 2013

• import vieux login rev 0.2

  

  root

  committed
  dede790

  Copy full SHA for dede790

Commits on Nov 28, 2013

• fix login import

  

  Julien Mottin

  committed
  af71d50

  Copy full SHA for af71d50

• merge with rev 0.3

  

  [email protected]

  committed
  93e50ce

  Copy full SHA for 93e50ce

Commits on Nov 29, 2013

• Force login to modify beer name

  

  [email protected]

  committed
  cc32753

  Copy full SHA for cc32753

• Merge branch 'develop' of /home/pi/brewpi-www into develop

  

  [email protected]

  committed
  5d4f1ce

  Copy full SHA for 5d4f1ce

• add include/membersite_config.php to ignore list

  

  Brewpi Gueydan Build

  committed
  88e743c

  Copy full SHA for 88e743c

• Merge branch 'develop' of github.com:yultreuse/brewpi-www into develop

  

  Brewpi Gueydan Build

  committed
  b7e85ee

  Copy full SHA for b7e85ee

• remove membersite_config from tracking

  

  [email protected]

  committed
  392941b

  Copy full SHA for 392941b

• deliver a membersite_config.php example file

  

  [email protected]

  committed
  cdea21e

  Copy full SHA for cdea21e