Commit graph

582 commits

Author SHA1 Message Date
Khanh Ngo 45b8c0c12b Merge remote-tracking branch 'chinkung/master' 2018-04-18 11:55:50 +07:00
Khanh Ngo 6a91a8e114
Merge pull request #250 from ngoduykhanh/docker
Use new docker compose file
2018-04-18 10:51:13 +07:00
Khanh Ngo 6f34685921
Update README.md 2018-04-18 10:34:46 +07:00
Khanh Ngo ffe95b6194
Update README.md 2018-04-18 10:32:10 +07:00
Khanh Ngo b32f46d988 Editing README 2018-04-18 10:31:00 +07:00
Khanh Ngo fba93a57e1 Merge updates from master branch 2018-04-18 10:12:07 +07:00
Khanh Ngo 5fbef40038 Adjustment in docker compose file to make sure mysql service is ready before starting pdns server and powerdn-admin 2018-04-18 10:07:24 +07:00
Khanh Ngo 5445efb1db Use .env file for docker-compose 2018-04-17 22:14:03 +07:00
Khanh Ngo 037e274b77 Add missing files 2018-04-17 21:21:42 +07:00
chinkung be7e012faf
Display history date/time using local timezone 2018-04-17 13:30:08 +07:00
chinkung 34d8e7392c
Display history date/time using local timezone 2018-04-17 13:28:54 +07:00
chinkung d466a5dd3e
Load moment.js in base.html 2018-04-17 13:26:18 +07:00
Khanh Ngo 5024cfad82 Change docker stuff 2018-04-16 22:42:29 +07:00
Khanh Ngo 01a5528c4a Merge remote-tracking branch 'mind04/template-relative' 2018-04-13 09:25:23 +07:00
Kees Monshouwer df9e392e26
domain stripping was not limited to the end of a name 2018-04-12 12:01:59 +02:00
Khanh Ngo 8b7653ad4a Change data column data type of DomainTemplateRecord to TEXT 2018-04-12 11:44:56 +07:00
Khanh Ngo 52b6966c83 Check zone serial before allowing user to submit their change. #183 2018-04-12 11:18:44 +07:00
Kees Monshouwer a12af5345d
fix clear history 2018-04-12 02:11:34 +02:00
Kees Monshouwer fc737cf61f
strip domain part from names while cloning a zone to a template 2018-04-11 18:14:42 +02:00
Khanh Ngo 84d4bfaed0 Mark LDAP authentication as external_auth. Fix OTP secret update. #237 2018-04-10 08:59:28 +07:00
Khanh Ngo fdf849744b Fix #238 2018-04-10 07:08:22 +07:00
Khanh Ngo 060e0917bc Fix #236 2018-04-09 18:50:55 +07:00
Khanh Ngo 5354d27f88 Fix #234 2018-04-08 09:09:08 +07:00
Khanh Ngo fc4e9dc9a0 #233. Make sure password hash is string before inserting to the db 2018-04-06 18:05:38 +07:00
Khanh Ngo 0826702537 Update config template 2018-04-06 13:22:09 +07:00
Khanh Ngo 37cab1aefa Merge branch 'master' of github.com:ngoduykhanh/PowerDNS-Admin 2018-04-02 14:32:09 +07:00
Khanh Ngo ca1290d1ac Change license information 2018-04-02 14:01:35 +07:00
Khanh Ngo cd45c972eb Update README.md 2018-04-02 13:45:44 +07:00
Khanh Ngo 17a892b18d Resolve the conflicts for #228 2018-04-02 13:38:53 +07:00
Khanh Ngo 6e07017361 Merge pull request #229 from ngoduykhanh/development
Merge development branch to master
2018-04-01 16:16:11 +07:00
Khanh Ngo 1f569626b3 Update README.md 2018-04-01 16:10:07 +07:00
Khanh Ngo df05fded39 Update README.md 2018-04-01 16:07:41 +07:00
Khanh Ngo 3efafecb30 Fix #194 2018-04-01 15:51:56 +07:00
Khanh Ngo 6fa8ae37f0 Fix #180. Adjustment in table style. 2018-04-01 15:48:08 +07:00
Khanh Ngo bfb54e8bda Add LDAP_ENABLE in config file 2018-04-01 15:08:55 +07:00
Khanh Ngo b7aefc57b2 Fix 169: enabling/disabling Two Factor Authentication doesn't work 2018-04-01 14:49:40 +07:00
Khanh Ngo f172a64ddd Remove DNSSEC modal. Adjustment in domain table css 2018-04-01 14:45:13 +07:00
Khanh Ngo 5df7fe445f Emphasis on zone name 2018-04-01 14:32:20 +07:00
Khanh Ngo 1c54f008f4 Change string to new format 2018-04-01 07:57:41 +07:00
Khanh Ngo 65da9a7a4f Adjustment in LDAP feature to work with python 3 2018-04-01 07:23:53 +07:00
Khanh Ngo 27074e688e Update development config 2018-04-01 07:05:57 +07:00
Khanh Ngo 41d691e2db Merge remote-tracking branch 'maysara/master' into development 2018-04-01 07:01:00 +07:00
Khanh Ngo cecc0ac9df Merge branch 'hotfix-ldap' into development 2018-03-31 08:26:50 +07:00
Khanh Ngo 29d1cf4117 Adjustment in domain template feature to work with python3 2018-03-31 08:21:02 +07:00
Khanh Ngo aa2b29dac3 Adjustment to give user access to granted domain only 2018-03-31 07:32:46 +07:00
Khanh Ngo ce6c3c21f1 Show user email address in user management table 2018-03-31 06:53:57 +07:00
Khanh Ngo 51cdba8228 User path: instead of string: in routes 2018-03-31 06:52:14 +07:00
Khanh Ngo c668c21fc9 Adjustment to prevent exception in Google/Github authentication when local user cannot be created 2018-03-30 17:43:34 +07:00
Khanh Ngo 358510b4e5 Merge remote-tracking branch 'softcat/SRV' into development 2018-03-30 16:45:36 +07:00
Khanh Ngo 7a9474c3f3 Fix cancel button in domain adding page 2018-03-30 16:40:53 +07:00