Thomas Waldmann 077b91c0dd Merge branch 'pu_translations' of github.com:mandrag0ra/nsupdate.info into mandrag0ra-pu_translations ...

Conflicts:
	nsupdate/main/templates/main/includes/tabbed_router_configuration.html
	nsupdate/main/templates/main/status.html
	nsupdate/templates/base.html

2014-06-06 22:46:32 +02:00

..

accounts

correct syntax errors

2014-05-27 01:36:57 +02:00

api

s/ssl/secure/g

2014-05-30 01:28:34 +02:00

locale/fr/LC_MESSAGES

correct presumed latest syntax errors

2014-05-30 14:55:50 +02:00

login

{% trans %} on .html files

2014-05-23 17:23:27 +02:00

main

Merge branch 'pu_translations' of github.com:mandrag0ra/nsupdate.info into mandrag0ra-pu_translations

2014-06-06 22:46:32 +02:00

management

use 1 transaction for the whole faults command db update

2014-05-29 20:42:29 +02:00

settings

Merge branch 'pu_translations' of github.com:mandrag0ra/nsupdate.info into mandrag0ra-pu_translations

2014-06-06 22:46:32 +02:00

static

{% trans %} on .html files

2014-05-23 17:27:18 +02:00

templates

Merge branch 'pu_translations' of github.com:mandrag0ra/nsupdate.info into mandrag0ra-pu_translations

2014-06-06 22:46:32 +02:00

utils

s/SSL/TLS/g (almost)

2014-05-30 01:10:33 +02:00

__init__.py

bump version to 0.6.0

2013-12-24 20:10:55 +01:00

context_processors.py

s/WE_HAVE_SSL/WE_HAVE_TLS/g

2014-05-30 01:18:50 +02:00

urls.py

uses nsupdate.login urls and fixed registration url in nsupdate.accounts

2013-12-29 22:22:08 +01:00

wsgi.py

fix default settings module name at some places

2013-12-15 17:16:04 +01:00