Merge branch 'koh'

Conflicts:
	auth/scopes.py
	requirements-nover.txt
	requirements.txt
	static/css/quay.css
	static/directives/namespace-selector.html
	static/js/app.js
	static/partials/manage-application.html
	templates/oauthorize.html
This commit is contained in:
Jimmy Zelinskie 2014-12-01 12:30:09 -08:00
commit f3259c862b
57 changed files with 537 additions and 141 deletions

View file

@ -15,10 +15,11 @@ PyPDF2==1.23
PyYAML==3.11
SQLAlchemy==0.9.8
Werkzeug==0.9.6
alembic==0.7.0
git+https://github.com/DevTable/aniso8601-fake.git
git+https://github.com/DevTable/anunidecode.git
git+https://github.com/DevTable/avatar-generator.git
aiowsgi==0.3
alembic==0.6.7
autobahn==0.9.3-3
backports.ssl-match-hostname==3.4.0.2
beautifulsoup4==4.3.2
@ -36,10 +37,10 @@ html5lib==0.999
itsdangerous==0.24
jsonschema==2.4.0
marisa-trie==0.6
git+https://github.com/NateFerrero/oauth2lib.git
mixpanel-py==3.2.0
git+https://github.com/NateFerrero/oauth2lib.git
paramiko==1.15.1
peewee==2.4.2
peewee==2.4.3
psycopg2==2.5.4
py-bcrypt==0.4
pycrypto==2.6.1