← Back to branch summary

~deadlight/canonical-identity-provider/add-vanilla-and-sass

~deadlight/canonical-identity-provider/add-vanilla-and-sass

Viewing all changes in revision 1684.

Committer: Karl Williams
Date: 2019-07-15 13:47:02 UTC
mfrom: (1682.1.12 work)
Revision ID: karl@deadlight.net-20190715134702-rpt9ciw3z98f57a0

Merge from master

files added:
src/webui/templates/404-no-token.html

files removed:
uci-vms.conf

files modified:
Makefile

Makefile.db

README

dependencies-devel.txt

dependencies.txt

django_project/settings_base.py

ols-vms.conf

po/api/api.pot

po/identityprovider/identityprovider.pot

po/ubuntu_sso_saml/ubuntu_sso_saml.pot

po/webui/webui.pot

requirements.txt

setup-container

src/api/v20/handlers.py

src/api/v20/tests/test_decorators.py

src/api/v20/tests/test_handlers.py

src/api/v20/tests/test_registration.py

src/api/v20/urls.py

src/identityprovider/admin.py

src/identityprovider/forms.py

src/identityprovider/middleware/honeypot.py

src/identityprovider/static/css/all.css

src/identityprovider/tests/test_admin.py

src/identityprovider/tests/test_forms.py

src/identityprovider/tests/test_middleware.py

src/identityprovider/tests/test_views_server.py

src/ubuntu_sso_saml/processors.py

src/ubuntu_sso_saml/tests/test_processors.py

src/ubuntu_sso_saml/tests/test_utils.py

src/ubuntu_sso_saml/utils.py

src/webservices/launchpad.py

src/webservices/tests/test_launchpad.py

src/webui/tests/test_views_account.py

src/webui/tests/test_views_registration.py

src/webui/tests/test_views_ui.py

src/webui/views/ui.py

Show diffs side-by-side

added added

removed removed

dependencies-devel.txt

dependencies.txt

django_project/settings_base.py

po/identityprovider/identityprovider.pot

po/ubuntu_sso_saml/ubuntu_sso_saml.pot

po/webui/webui.pot

requirements.txt

setup-container

src/api/v20/handlers.py

src/api/v20/tests/test_decorators.py

src/api/v20/tests/test_handlers.py

src/api/v20/tests/test_registration.py

src/api/v20/urls.py

src/identityprovider/admin.py

src/identityprovider/forms.py

src/identityprovider/middleware/honeypot.py

src/identityprovider/static/css/all.css

src/identityprovider/tests/test_admin.py

src/identityprovider/tests/test_forms.py

src/identityprovider/tests/test_middleware.py

src/identityprovider/tests/test_views_server.py

src/ubuntu_sso_saml/processors.py

src/ubuntu_sso_saml/tests/test_processors.py

src/ubuntu_sso_saml/tests/test_utils.py

src/ubuntu_sso_saml/utils.py

src/webservices/launchpad.py

src/webservices/tests/test_launchpad.py

src/webui/templates/404-no-token.html

src/webui/tests/test_views_account.py

src/webui/tests/test_views_registration.py

src/webui/tests/test_views_ui.py

src/webui/views/ui.py

Older »