From: Julien Rabier Date: Mon, 3 Sep 2012 19:20:37 +0000 (+0200) Subject: Merge branch 'reorganize_files' of git.ndn.cx:cavote X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/%24wgScriptPath/%40%20%27entree_login%27%20=%3E%20%27Your%20login%27%2C%20%27entree_login_connexion_1%27%20=%3E%20%27Connection%20login%27%2C%20%27entree_login_connexion_2%27%20=%3E%20%27%28Sometimes%20matches%20your%20FTP%20account%20login%20and%20sometimes%20left%20empty%29%27%2C-%27entree_login_ldap%27%20=%3E%20%27Initial%20LDAP%20login%27%2C%20%27entree_mot_passe%27%20=%3E%20%27Your%20password%27%2C%20%27entree_mot_passe_1%27%20=%3E%20%27Password%27%2C%20%27entree_mot_passe_2%27%20=%3E%20%27%28Sometimes%20matches%20your%20FTP%20access%20password%20and%20sometimes%20left%20empty%29%27%2C%40%40%20-150%2C7%20%20121%2C7%20%40%40%20Do%20not%20submit%20this%20import%20request.%3Cp%3EFor%20more%20information%2C%20please%20see%20%3Ca%20href=?a=commitdiff_plain;h=0f93afde08f333a6615145615f424db26240b512;p=cavote.git Merge branch 'reorganize_files' of git.ndn.cx:cavote Conflicts: main.py --- 0f93afde08f333a6615145615f424db26240b512 diff --cc main.py index d56e251,5cc7e32..3ac3664 --- a/main.py +++ b/main.py @@@ -15,18 -15,10 +15,9 @@@ import hashli import smtplib import string - DATABASE = '/tmp/cavote.db' - PASSWD_SALT = 'change this value to some random chars!' - SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:' - DEBUG = True - TITLE = u"Cavote FFDN" - EMAIL = '"' + TITLE + '"' + ' <' + u"cavote@ffdn.org" + '>' - VERSION = "cavote 0.2.0" - SMTP_SERVER = "127.0.0.1" - PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Blanc': [u'Oui', u'Non', u'Blanc'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']} - - app = Flask(__name__) - app.config.from_object(__name__) + from settings import * + -app = Flask(__name__) -app.config.from_object(__name__) ++app = Flask(__name__) app.config.from_object(__name__) oid = OpenID(app)