Merge remote-tracking branch 'origin/master' into umask

Conflicts:
	initdb.py
	test/data/test.db
This commit is contained in:
yackob03 2014-01-22 11:53:20 -05:00
commit 459f30c123
46 changed files with 78463 additions and 7 deletions

View file

@ -33,7 +33,7 @@
<div class="panel-title">Organization's e-mail address</div>
<div class="panel-content" style="padding-left: 20px; margin-top: 10px;">
<form class="form-change" id="changeEmailForm" name="changeEmailForm" ng-submit="changeEmail()" data-trigger="manual"
data-content="{{ changeEmailError }}" data-placement="right" ng-show="!updatingOrganization">
data-content="{{ changeEmailError }}" data-placement="bottom" ng-show="!updatingOrganization">
<img src="//www.gravatar.com/avatar/{{ organizationEmail | gravatar }}?s=24&amp;d=identicon">
<input type="email" class="form-control" ng-model="organizationEmail"
style="margin-left: 10px; margin-right: 10px; width: 400px; display: inline-block;" required>