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

1657 Commits

Author SHA1 Message Date
Michael Kaufmann
174739bc0c Merge remote-tracking branch 'origin/master' into 0.10.0 2018-08-15 10:59:36 +02:00
Michael Kaufmann
b777053133 allow a higher amount of diskspace and traffic to be entered in the forms, fixes #560 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-08-15 10:59:16 +02:00
Michael Kaufmann
963c7c4616 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-07-10 09:47:20 +02:00
Michael Kaufmann
1690cadab9 show link to clear plaintext email account passwords if enabled; set store-plaintext-passwords default to 'off'; fixes #557 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-07-10 09:47:01 +02:00
Michael Kaufmann
d4312fc481 update jquery/jquery-ui; fininshed api_key editing (needs a bit more validating); added PhpSettings-Unit-test 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-22 10:05:04 +02:00
Michael Kaufmann
f198833f8c Merge remote-tracking branch 'origin/master' into 0.10.0 2018-06-21 08:12:00 +02:00
Michael Kaufmann
436d141bd1 fix ticket access when posting answer 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-21 07:52:11 +02:00
Michael Kaufmann
aa881560cc deny access to tickets not owned by current user, thx to chbi 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-19 21:46:11 +02:00
Michael Kaufmann
d39cebc70e Merge remote-tracking branch 'origin/master' into 0.10.0 2018-06-01 08:01:09 +02:00
Michael Kaufmann
b80bdcbc4f forgot to add version file 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-29 15:54:44 +02:00
Michael Kaufmann
c1e62e6be7 get rid of serialization completely to avoid possible code execution, fixes #555 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-29 15:47:41 +02:00
Michael Kaufmann
10330f8a7a fix fallback redirect code when customredirect is enabled and default is selected 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 17:44:36 +02:00
Michael Kaufmann
f8236dff7b fix not quite correctly webserver-log-piping 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 14:44:59 +02:00
Michael Kaufmann
8ccb898aa9 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-05-24 13:25:24 +02:00
Michael Kaufmann
5a070d6d91 add settings to customize webserver logs 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 11:36:13 +02:00
Robert Förster (Dessa)
07a3f76568 remove wheezy configs 2018-05-10 16:42:27 +02:00
Michael Kaufmann
926914788f Merge remote-tracking branch 'origin/master' into 0.10.0 2018-04-25 12:30:00 +02:00
Michael Kaufmann
6f9187d1bb Merge branch 'master' of github.com:Froxlor/Froxlor 2018-04-25 12:29:41 +02:00
Michael Kaufmann
84b8cda7ac allow usage of up to 255 characters in a txt record, fixes #548 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-04-25 12:29:30 +02:00
Michael Kaufmann
b3d018c506 corrected usage of default redirect code from settings; fixes #546 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-04-25 12:27:40 +02:00
Robert Förster (Dessa)
2508d855e3 deprecate precise, as xenial configs are now available 2018-04-03 13:12:32 +02:00
Erik
a21f3c5a3f added xenial.xml (#533) 
* added xenial.xml

* fixed touch commands as in commit 3c802038f2

* changed a2dismod php to a2dismod php7.0

* fixed overlooked a2dismod php to a2dismod php7.0
 2018-04-03 12:59:14 +02:00
Michael Kaufmann (d00p)
3f69c97874 opzimize ApiParameter::getModFunctionString(); corrected FpmDaemons::update(); added a few more unit-tests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-04-01 10:31:38 +02:00
Michael Kaufmann (d00p)
85407abfb4 optimize stats-folder-decision in Customers-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-04-01 09:59:25 +02:00
Michael Kaufmann (d00p)
d15e4a8270 more unit-tests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-27 14:43:24 +02:00
Michael Kaufmann (d00p)
cb3d5f3488 unit-test FpmDaemons-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-26 14:26:05 +02:00
Michael Kaufmann (d00p)
efb416ae7c phpdoc for Admins-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-26 10:13:51 +02:00
Michael Kaufmann (d00p)
c98be3c04f finished unit-tests for Mysqls-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-26 09:53:09 +02:00
Michael Kaufmann (d00p)
6006b16c95 added first test for Mysqls-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-25 12:38:57 +02:00
Michael Kaufmann (d00p)
c149cbacf7 more DomainZones unit-tests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-23 13:35:50 +01:00
Michael Kaufmann (d00p)
48d7110779 add first unit tests for DomainZones ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-22 14:56:18 +01:00
Michael Kaufmann (d00p)
bd7f2c2654 add unit-tests for CustomerBackup-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-21 20:22:43 +01:00
Michael Kaufmann (d00p)
190c95baca created DomainZones ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-19 21:25:23 +01:00
Michael Kaufmann (d00p)
975d46044d added unit-tests for DirOptions 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-19 20:38:59 +01:00
Michael Kaufmann (d00p)
bf589cdec8 forgot to check for customer-id in CustomerBackups.delete() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-19 10:52:38 +01:00
Michael Kaufmann (d00p)
715e5f7a64 fix update of domain as admin if domain is a std-subdomain; fix update of mysql-entry; add CustomerBackups-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-19 10:45:12 +01:00
Michael Kaufmann (d00p)
dfcb7160cb fix global lng-array 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-18 08:45:20 +01:00
Michael Kaufmann (d00p)
f5654d5931 fix var-names in DirOptions-ApiCommand; fix pmd issues 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-18 08:42:22 +01:00
Michael Kaufmann (d00p)
7a68dfc450 DirProtections and DirOptions stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-15 19:35:56 +01:00
Michael Kaufmann (d00p)
858a9ba6a4 added DirProtections.update() and various unit-tests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-15 11:01:17 +01:00
Michael Kaufmann (d00p)
f2809c47ac finished DirProtections.add() and some basic tests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-14 19:41:12 +01:00
Michael Kaufmann (d00p)
616fb77de5 check for installed/configured froxlor in api.php and return 404 if not 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-14 18:13:32 +01:00
Michael Kaufmann (d00p)
b03d41087a Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-14 11:41:42 +01:00
Michael Kaufmann (d00p)
3c802038f2 split touch-command for multiple files into single ones, fixes #535 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-14 11:35:03 +01:00
Michael Kaufmann (d00p)
ae3d954766 started work on DirProtections-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 22:07:51 +01:00
Michael Kaufmann (d00p)
05857985f8 add more tests for Email-ApiCommands 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 21:29:03 +01:00
Michael Kaufmann (d00p)
a7523bbdea add domainid to result-list of Emails.get(); fix typo in EmailAccounts.add(); enhance debugging in Database-class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 15:52:34 +01:00
Michael Kaufmann (d00p)
f0e084ef0e minor fixes in EmailAccounts.update() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 14:17:45 +01:00
Michael Kaufmann (d00p)
fa7bb53d58 added EmailAccounts-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 14:13:35 +01:00
Michael Kaufmann (d00p)
6fc8cce8f5 add EmailAccounts.add; added wrapper function ApiCommand.getMailTemplate() to reduce code-duplication 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 13:44:44 +01:00