maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,834 Commits 6 Branches 188 Tags
69495b94af47aa6cea24a641ff10d571dcc3f75e
Commit Graph

3834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
69495b94af add 2FA mechanism, fixes #547 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-30 13:45:17 +01:00
Michael Kaufmann
29c754e700 add new CUSTOMER_HOMEDIR replacer for php-configs, thx to rubberduck for the hint 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-29 09:37:18 +01:00
Michael Kaufmann
fd69fc22db format composer.json and add php-7.0 as dev-requirement (phpunit6); add unit-test for Backup.add() when customer passes / as path value 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-28 13:17:44 +01:00
Michael Kaufmann
c7bee4edf2 update 0.9.x updater according to latest bugfix-release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-27 18:53:37 +01:00
Michael Kaufmann
9756c792d7 disable sending of emails when running tests completely when run on travis 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-27 12:05:56 +01:00
Michael Kaufmann
a86f10a4b4 fix typo in function name, refs #601 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-27 11:49:32 +01:00
Michael Kaufmann
946c2507c5 last try before i branch for testing this - next time, really 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 22:00:50 +01:00
Michael Kaufmann
56ac4b5c26 last try before i branch for testing this :P 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 21:57:15 +01:00
Michael Kaufmann
e4becfb1dd add missing php-invoker stuff 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 21:50:35 +01:00
Michael Kaufmann
6129768711 actually use the required phpunit version pulled from composer 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 21:38:36 +01:00
Michael Kaufmann
72690e311f add specific phpunit version to dev-requirements 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 21:33:40 +01:00
Michael Kaufmann
2ef067e12d set a few settings according to the test-system 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 21:05:57 +01:00
Michael Kaufmann
ae71e3ad2a new try with travis-ci #last-really 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:29:27 +01:00
Michael Kaufmann
745621c416 new try with travis-ci #last 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:23:56 +01:00
Michael Kaufmann
069ccd24e6 new try with travis-ci #3 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:16:15 +01:00
Michael Kaufmann
76b5f813c5 new try with travis-ci #2 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:12:32 +01:00
Michael Kaufmann
9ad6616fa3 new try with travis-ci 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:09:27 +01:00
Michael Kaufmann
4dca2d6217 travis-ci testing... 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:00:40 +01:00
Michael Kaufmann
eab88abd54 Merge pull request #596 from foliengriller/composer-json 
Adds first composer.json file
 2018-11-26 20:00:08 +01:00
Michael Kaufmann
ea3c49befe Update composer.json 2018-11-26 19:56:39 +01:00
Michael Kaufmann
e1bfb2690d Update composer.json 2018-11-26 19:53:34 +01:00
Michael Kaufmann
091f92400b move integer-conversion of array to the place where the array is known 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 12:21:02 +01:00
Michael Kaufmann
18df961381 ensure allowed_phpconfigs parameter for Customers.add() and Customers.edit() is an integer-array, fixes #598 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 12:14:53 +01:00
Michael Kaufmann
18c49e4c48 Merge pull request #595 from foliengriller/gitignore 
Improves gitignore and deletes unused .keep in /logs
 2018-11-26 06:51:53 +01:00
Michael Rosenberger
4da9d4c7c0 Adds first composer.json file 2018-11-25 23:24:30 +01:00
Michael Rosenberger
9a528532d2 Improves gitignore and deletes unused .keep in /logs 2018-11-25 21:49:41 +01:00
Michael Kaufmann
96addebdf3 Merge pull request #594 from Broatcast/patch-1 
Change formfield id for new admins
 2018-11-25 17:42:06 +01:00
Michael Kaufmann
49adcb6886 Merge branch 'heavygale-master' 2018-11-25 17:38:05 +01:00
Michael Kaufmann
ed86c2a892 Merge branch 'master' of https://github.com/heavygale/Froxlor into heavygale-master 2018-11-25 17:37:52 +01:00
Robert Kuntz
7c7ef5be09 Change formfield id for new admins 
little Bug, requested "new_loginname" instead of "loginname"
 2018-11-25 17:30:48 +01:00
Michael Kaufmann
c269cd5c5c added unit-tests for version-check; implemented settings import/export in API; minor variable declarations 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-25 11:17:56 +01:00
Michael Kaufmann
f6e0298d25 more api-documentation and code-formatting 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-25 10:04:09 +01:00
Michael Kaufmann
983e1ce6ad add more api documenation 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-24 19:49:27 +01:00
Michael Kaufmann
a87f1c5561 trim ip-addresses for validation as they are invalid with leading/trailing spaces 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-24 07:53:08 +01:00
Michael Kaufmann
9d82f0d269 Merge pull request #593 from foliengriller/master 
Improves CSS in installer
 2018-11-23 14:55:14 +01:00
Michael Rosenberger
32b5bef221 Improves CSS in installer 
Correct alignment of radio options
Fixes design-problem with chrome
 2018-11-23 14:34:11 +01:00
Michael Kaufmann
50eec8d8a7 Merge pull request #592 from foliengriller/master 
Some minor CSS improvements
 2018-11-23 11:18:45 +01:00
Michael Kaufmann
fc8373f6b6 fix unit-test testCustomerEmailForwardersDelete() to comply with new testCustomerEmailForwardersAddWithSpaces() 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-23 09:06:23 +01:00
Michael Kaufmann
1d3d8d0f28 trim email address when added as forwarder, fixes #591 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-23 09:03:35 +01:00
Michael Rosenberger
b9e4adc634 Some minor CSS improvements 
- Removes unit if value is 0
- Uses shorthand notation where possible

Signed-off-by: Michael Rosenberger <mr@simpelwebservice.de>
 2018-11-22 23:38:54 +01:00
Michael Kaufmann
3a3b35b2eb add ipv6 support for resolving nameserver-hostnames 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-21 19:26:19 +01:00
Michael Kaufmann
8a565532b2 more api-doc 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-19 20:38:18 +01:00
Michael Kaufmann
02ba4b5f67 Merge branch 'master' of github.com:Froxlor/Froxlor 2018-11-18 20:35:47 +01:00
Michael Kaufmann
b032f5b2ba add dhparams for webserver/ssl, refs #519 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-18 20:35:27 +01:00
Michael Kaufmann
758111a7c1 Merge pull request #589 from heavygale/patch-2 
Update list.tpl
 2018-11-18 15:20:34 +01:00
Max
ba124c99af Update list.tpl 2018-11-18 15:09:59 +01:00
Michael Kaufmann
776bb56b24 add more phpdoc to DomainZones ApiCommand; minor fixes in DirOptions and DirProtections 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-18 15:07:06 +01:00
Michael Kaufmann
d2024e06ff more phpdoc in DirOptions and DirProtections 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-18 14:54:20 +01:00
Michael Kaufmann
8c8be45769 added more phpdoc for api-documentation 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-18 14:39:20 +01:00
Michael Kaufmann
892d259805 Also remove DNS zones of deleted Subdomains, refs #581 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-17 20:19:29 +01:00