Thomas Waldmann
0b21532bd6
partially revert commit 78b27f65c0a90eb51fba09112e9bc681b8070b1a
...
the host.get_ipv4 (and same for get_ipv6) call was duplicated, resulting in
additional ns queries.
also, the semantics of this part of the change was unclear or even erroneous.
get_ipv4 returns either the ip address or 'error', so that "if" would always
gets a trueish value to evaluate, making it pointless.
2014-01-16 00:08:09 +01:00
ThomasWaldmann
bf72818e20
Merge pull request #126 from elnappo/master
...
some improvements
2014-01-15 14:52:27 -08:00
Fabian Weisshaar
b051449778
minor fix login.html
2014-01-15 15:31:49 +01:00
Fabian Weisshaar
0f0bb633d5
fix errors for pull request
2014-01-15 15:24:26 +01:00
Thomas Waldmann
f963672c42
m0nowall configuration: fix homepage link
2014-01-11 01:56:54 +01:00
René Moser
20e1f87588
added m0n0wall router configuration
2013-12-31 16:36:27 +01:00
Fabian Weisshaar
78b27f65c0
col-lg to col-md, add warning badges for no SSL updates
2013-12-30 14:26:53 +01:00
Fabian Weisshaar
8870c0e4eb
change some forms for better looking
2013-12-30 14:24:14 +01:00
Fabian Weisshaar
1b2644c5b9
change grid layout form col-lg to col-md for better layout
2013-12-30 14:23:02 +01:00
Fabian Weisshaar
43622ab183
remove login, password_change and password_reset template from old location
2013-12-29 22:56:07 +01:00
Fabian Weisshaar
10c0247f77
add nsupdate.login
2013-12-29 22:55:05 +01:00
Fabian Weisshaar
73e37dad14
uses nsupdate.login urls and fixed registration url in nsupdate.accounts
2013-12-29 22:22:08 +01:00
Fabian Weisshaar
ffaa19abc2
add nsupdate.login app
2013-12-29 22:20:45 +01:00
Fabian Weisshaar
7bc356a67c
add registration urls. fixes django 1.6 and django-registration issue
2013-12-29 22:18:28 +01:00
Fabian Weisshaar
0dc403ae04
change some links, move jquery to bottom and add some trans strings
2013-12-29 22:16:22 +01:00
Fabian Weisshaar
47900ff37e
layout
2013-12-29 21:48:20 +01:00
Fabian Weisshaar
924b9ad3ad
add ModelAdmin for DomainAdmin, HostAdmin and BlacklistedDomainAdmin
2013-12-29 21:44:40 +01:00
René Moser
f2dfd04c7e
fixed non valid html in hostconfig_overview, added colspan
2013-12-28 09:34:34 +01:00
René Moser
9d808f88f2
fixed non valid html in overview, added colspan
2013-12-28 01:12:03 +01:00
Thomas Waldmann
6b526f4ebd
fix 500 error when domain does not exist
...
happens if POST contains a faked basedomain (not from our dropdown list)
2013-12-27 13:03:48 +01:00
Thomas Waldmann
3aabe41c1b
profile view: require login (gave 500 without login)
2013-12-25 16:30:33 +01:00
Thomas Waldmann
0203fdb856
make api tests also use a random hostname (but constant throughout the test session)
2013-12-25 04:42:40 +01:00
Thomas Waldmann
852e541778
make the tests use a test zone
...
for the dnstools tests, tests were already changed to use a random test host in the test zone,
so parallel tests runs should not use the same hostnames.
test_api tests still use same host names, though
2013-12-25 03:38:08 +01:00
Thomas Waldmann
bf2f5bbe7e
fix py3 compatibility
2013-12-24 21:44:11 +01:00
Thomas Waldmann
ba977193ce
Merge branch 'master' into py3-port
...
Conflicts:
nsupdate/main/_tests/test_main.py
2013-12-24 21:31:40 +01:00
Thomas Waldmann
11b56ee5db
bump version to 0.6.0
2013-12-24 20:10:55 +01:00
Thomas Waldmann
bbe7ae096a
reorder apps, so templates of django's "admin" get considered last (so nsupdate or django registration can override them)
2013-12-22 02:58:25 +01:00
Thomas Waldmann
b317837f58
add a test for dnserr api response
...
and also fix dnserr api response - should not contain additional info, but just "dnserr"
2013-12-18 04:08:18 +01:00
Thomas Waldmann
b718b93453
test more main views, exclude csrf failure view from coverage
2013-12-18 03:50:41 +01:00
Thomas Waldmann
3d53d8f1fd
fix faults command help strings
2013-12-18 03:18:35 +01:00
Thomas Waldmann
f7d081cfc8
add tests for management commands
2013-12-18 03:16:12 +01:00
Thomas Waldmann
01d278489f
upgrade bootstrap cdn url to 3.0.3
2013-12-18 01:16:32 +01:00
Thomas Waldmann
201b930334
use jquery cdn
2013-12-18 01:14:58 +01:00
Thomas Waldmann
f1fae4e28e
js update client: add verbose messages, but also display the original result code
2013-12-16 00:15:51 +01:00
Thomas Waldmann
38b37b132f
dnstools: reviewed/improved docstrings
2013-12-15 18:44:33 +01:00
Thomas Waldmann
14b9407ab5
remove unused imports
2013-12-15 18:27:59 +01:00
Thomas Waldmann
807fcaca5a
_update: remove unused agent param
2013-12-15 18:12:10 +01:00
Thomas Waldmann
758a38f95e
fix some minor issues found by pycharm code checker
2013-12-15 18:05:19 +01:00
Thomas Waldmann
271666876d
update robots.txt
2013-12-15 17:36:38 +01:00
Thomas Waldmann
cf6629a0a8
add/fix more docstrings
2013-12-15 17:29:55 +01:00
Thomas Waldmann
e18b725096
fix default settings module name at some places
...
note: in production, you will usually have to specify an OWN module (like local_settings) that imports from nsupdate.settings.prod and then overrides whatever you need to be different
2013-12-15 17:16:04 +01:00
Thomas Waldmann
0df4efce1c
add/fix some module-level docstrings
2013-12-15 17:09:22 +01:00
Thomas Waldmann
3f92c27125
include changelog in docs, cosmetic docs and pep8 fixes
2013-12-15 16:50:18 +01:00
Thomas Waldmann
cae77f53c9
make settings a package, split settings into base / dev / prod settings
2013-12-14 03:41:04 +01:00
Thomas Waldmann
711aba237f
python 3.3 port
...
not much tested yet, be careful
2013-12-14 00:35:29 +01:00
Thomas Waldmann
e2e07b60e3
dnstools: make timeouts configurable via ENV, travis: use longer timeouts
2013-12-13 03:04:00 +01:00
Thomas Waldmann
b9c48e5af7
backport to python 2.6, add it travis platforms and to pypi metadata
2013-12-12 01:27:36 +01:00
Thomas Waldmann
5f28b56b9f
add more comments to settings.py, esp. about the different kinds of HOSTs
2013-12-12 01:06:48 +01:00
Thomas Waldmann
d17bdd8006
remove local_settings import, document how local_settings.py should be used, reorder admin docs
2013-12-11 23:31:30 +01:00
Thomas Waldmann
2516b48c88
django-debug-toolbar - we pull it via requirements, so i added the necessary settings so it can work
...
maybe the more simple "quick setup" (see ddt docs) would also have worked, if I had found out earlier
that INTERNAL_IPS is a required setting.
2013-12-08 14:42:58 +01:00
