TW
561a8090df
Merge pull request #297 from ThomasWaldmann/py36
...
travis: test on py36, setup.py: declare py36 support
2017-01-21 03:12:35 +01:00
Thomas Waldmann
228c4f8085
travis: test on py36
2017-01-21 02:51:57 +01:00
TW
eb11c86046
Merge pull request #296 from ThomasWaldmann/fix-setup
...
update setup.py according to requirements.d/all.txt
2017-01-21 02:16:22 +01:00
Thomas Waldmann
81df8cc1ea
update setup.py according to requirements.d/all.txt
2017-01-21 02:03:51 +01:00
TW
f38cc72c56
Merge pull request #291 from elnappo/registration
...
Upgrade django-registration-redux
2017-01-21 01:00:21 +01:00
TW
8b63cea4b2
Merge pull request #290 from elnappo/upgrade_social
...
upgrade python-social-auth
2017-01-20 23:52:51 +01:00
TW
f905eba084
Merge pull request #289 from elnappo/upgrade-jquery
...
upgrade to jQuery 3.1.1 fix #178
2017-01-20 23:21:03 +01:00
Fabian Weisshaar
cb7f55d55d
upgrade python-social-auth
2016-12-29 17:53:27 +01:00
Fabian Weisshaar
dfe0e1c7f0
This fixes #250 , fixes #251 and fixes #252
2016-12-28 20:24:00 +01:00
Fabian Weisshaar
8a56770870
upgrade to jQuery 3.1.1, bootstrap 3.3.7 and font-awesome 4.7.0 fixes #178
2016-12-28 20:20:15 +01:00
TW
8b594c8042
Merge pull request #283 from ThomasWaldmann/fix-auth-decode
...
api basic auth - ignore non-utf8 chars, fixes #282
2016-09-05 16:52:59 +02:00
Thomas Waldmann
253391053c
api basic auth - ignore non-utf8 chars, fixes #282
2016-09-05 16:51:44 +02:00
TW
fbb781dd81
Merge pull request #280 from ThomasWaldmann/fix-247
...
fix crash on ShortHeader and other DNSException subclasses, fixes #247
2016-08-27 17:48:30 +02:00
Thomas Waldmann
118d0d51fd
fix crash on ShortHeader and other DNSException subclasses, fixes #247
2016-08-27 17:29:59 +02:00
TW
6ffc2651c8
Merge pull request #279 from elnappo/patch-1
...
fix #278
2016-08-17 13:38:13 +02:00
Fabian Weisshaar
2a059a9f48
fix #278
2016-08-17 13:16:14 +02:00
TW
60438d84fb
Merge pull request #277 from ThomasWaldmann/update-badges
...
update badges, new readthedocs.io url
2016-08-14 03:18:14 +02:00
Thomas Waldmann
a9ab90e3f6
update badges, new readthedocs.io url
...
but: readthedocs.io does not work for the badge
2016-08-14 03:16:30 +02:00
TW
903d81a6f7
Merge pull request #276 from ThomasWaldmann/update-badges
...
update badges, new readthedocs.io url
2016-08-14 03:11:49 +02:00
Thomas Waldmann
b24ff0662c
update badges, new readthedocs.io url
...
but: readthedocs.io does not work for the badge
2016-08-14 03:09:54 +02:00
TW
410c0d7195
Merge pull request #275 from ThomasWaldmann/fix-pep8
...
settings.base: fix pep8
2016-08-14 02:52:54 +02:00
TW
7e266634ff
Merge pull request #274 from ThomasWaldmann/travis-with-bind
...
travis: test on trusty with sudo, against local bind9 dns
2016-08-14 02:40:37 +02:00
Thomas Waldmann
d0f225b3af
settings.base: fix pep8
2016-08-14 02:38:34 +02:00
Thomas Waldmann
d7a8d9c214
travis: test on trusty with sudo, against local bind9 dns
2016-08-14 02:34:10 +02:00
TW
c2a3d2da78
Merge pull request #273 from ThomasWaldmann/update-changes
...
update CHANGES
2016-08-14 00:07:07 +02:00
Thomas Waldmann
c5b1567f18
update CHANGES
2016-08-14 00:06:12 +02:00
TW
634996be57
Merge pull request #270 from ThomasWaldmann/fix-templating
...
Fix templating
2016-08-13 23:57:29 +02:00
TW
9d30ca1014
Merge pull request #271 from ThomasWaldmann/fix-hostadd-sameip-crash
...
fix SameIpError in host add form processing, fixes #267
2016-08-13 23:56:25 +02:00
TW
0baa8b8571
Merge pull request #272 from ThomasWaldmann/fix-openwrt-config
...
update OpenWrt config example for Chaos Calmer, fixes #259
2016-08-13 23:55:07 +02:00
Thomas Waldmann
a1216d1967
update OpenWrt config example for Chaos Calmer, fixes #259
2016-08-13 23:45:00 +02:00
Thomas Waldmann
9f97cb2769
fix SameIpError in host add form processing, fixes #267
2016-08-13 23:38:43 +02:00
Thomas Waldmann
4deac259bc
use TEMPLATES setting for Django 1.8+
...
TEMPLATE_* == old, pre-django-1.8 settings (removed)
TEMPLATES == Django 1.8+ settings
2016-08-13 22:39:29 +02:00
Thomas Waldmann
51803eebec
fix first param type of loader.select_template, fixes #255
...
must be a list of templates names, not a single template names.
2016-08-13 22:23:02 +02:00
TW
be3253c140
Merge pull request #269 from ThomasWaldmann/upgrades
...
travis: drop py33, pip: remove --use-mirrors
2016-08-13 20:03:15 +02:00
TW
aa6b081895
Merge pull request #268 from ThomasWaldmann/update-changes
...
Update changes
2016-08-13 20:02:23 +02:00
Thomas Waldmann
557779051e
travis: drop py33, pip: remove --use-mirrors
2016-08-13 20:01:31 +02:00
Thomas Waldmann
249027076b
fixup: update CHANGES, again
2016-08-13 16:10:49 +02:00
TW
9268a2a389
Merge pull request #263 from FreeMinded/master
...
Update pfSense tab to get IP from Result Match
2016-05-23 17:46:11 +02:00
Pascal Mages
9fb3703827
Update pfSense tab to get IP from Result Match
...
added %IP% for pfSense result match to properly catch the cached IP address. Without pfSense reports 0.0.0.0 in the webgui.
2016-05-23 14:49:08 +02:00
TW
bf5f4510c4
Merge pull request #261 from elnappo/integrity
...
Update font awesome and jquery, add subresource integrity see #23
2016-04-13 13:45:52 +02:00
Fabian Weisshaar
bca9aaf296
Update font awesome and jquery, add subresource integrity see #23
2016-04-13 09:48:06 +02:00
TW
d3451be2ea
Merge pull request #254 from elnappo/check_domain_fixes
...
fixes #246 , #249 , #253
2016-01-26 14:37:03 +01:00
Fabian Weisshaar
f987fae7e0
fixes #246 , #249 , #253 . except DnsUpdateError and use random IP in check_domain().
...
The delete() was removed because after an add() the nameserver need time to process the nsupdate query. This leads to an NXDOMAIN response on current ip check in delete() thus the delete() call fails.
2016-01-26 14:33:18 +01:00
Thomas Waldmann
4c6b7b56a0
downgrade django-registration-redux, fixes #250
...
seems like our code is not compatible with d-r-r 1.2 as using it breaks at least the password reset.
2016-01-08 02:12:54 +01:00
Thomas Waldmann
893ef1ae00
do not use html registration emails
...
we override the text email template, but not the html email template.
the django-registration-redux docs say that one should switch off
html email in the config in that case.
2016-01-08 01:49:57 +01:00
TW
4891869c37
Merge pull request #244 from elnappo/db-opti
...
optimize database query on overview page
2016-01-02 01:14:27 +01:00
TW
3aa702950f
Merge pull request #245 from elnappo/update-cdn-links
...
Update bootstrap and font-awesome
2015-12-30 12:14:51 +01:00
Fabian Weisshaar
d7715e0975
Update bootstrap and font-awesome
2015-12-30 12:05:28 +01:00
Fabian Weisshaar
4717da5ae6
optimize database query on overview page
2015-12-30 11:51:39 +01:00
Thomas Waldmann
58f7237654
add migration for f5107138908d728da043faf77f72dee241338ce5
2015-12-29 17:24:37 +01:00