maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Commit Graph

  • e92b5e2c05 set version to 0.9.33-rc3 due to the password-hash-update-issue Michael Kaufmann (d00p) 2015-01-31 12:54:00 +01:00
  • 4d60b19194 only update hash if password matches, fixes #1479 Michael Kaufmann (d00p) 2015-01-31 12:51:20 +01:00
  • 7680cd441c force integer conversion for domainimport-offset-field, as POST sends it as string; filter IP-addresses that are unknown to froxlor when importing domains. 0.9.33-rc2 Michael Kaufmann (d00p) 2015-01-30 17:55:27 +01:00
  • d7f8586413 allow language-check against a specific language file Michael Kaufmann (d00p) 2015-01-30 17:54:06 +01:00
  • 83e062c845 remove unused Minify_HTML class Michael Kaufmann (d00p) 2015-01-30 17:53:43 +01:00
  • c6c950596a use better error-message for misuse of froxlor.hostname Michael Kaufmann (d00p) 2015-01-28 22:01:16 +01:00
  • 4714a458fe don't allow a customer to add the froxlor-hostname as subdomain in case the froxlor-hostname is sub.dom.tld and the customer has dom.tld assigned, thx to chrisalexthomas for 'finding' this :) Michael Kaufmann (d00p) 2015-01-28 21:55:46 +01:00
  • 1672b01426 Merge branch 'master' of github.com:Froxlor/Froxlor Michael Kaufmann (d00p) 2015-01-28 13:25:08 +01:00
  • 36c7527b2a add function to validate different password-hashes and update them to the currently set hash if login successfull and hash differs, set default hash to SHA256, fixes #1289 - add custom-notes field to admin/customer, fixes #1471 - set version to 0.9.33-rc2 for upcoming second release-candidate Michael Kaufmann (d00p) 2015-01-28 13:24:36 +01:00
  • 00e74a05cb Disable input if unlimited is checked Roman Schmerold (BNoiZe) 2015-01-28 04:54:00 +01:00
  • 7904946862 push some upcoming changes (still holding back db changes b/c of version jump to rc2) Michael Kaufmann (d00p) 2015-01-27 23:04:46 +01:00
  • 88ace5785e Fix broken custom newsfeed, newsfeed redesign Roman Schmerold (BNoiZe) 2015-01-27 22:43:52 +01:00
  • 614d9c127b fix mail delivery for dovecot, closes #1465 Robert Förster (Dessa) 2015-01-27 17:26:41 +01:00
  • f0551ac122 Merge pull request #212 from junkpad92/master Dessa 2015-01-27 17:52:36 +01:00
  • bdfbe4947a fix undefined variables introduced in commit #b1acc9a8efc01a5139b042f8f9e97881e4a52b83 Michael Kaufmann (d00p) 2015-01-27 11:23:03 +01:00
  • 7b8341d826 add function to validate different password-hashes and update them to the currently set hash if login successfull and hash differs (unimplemented yet because of required db-updates which are hold back until 0.9.33-rc2), refs #1289 Michael Kaufmann (d00p) 2015-01-27 11:09:27 +01:00
  • 9d008efabc Merge pull request #224 from heaven73/master Michael Kaufmann 2015-01-26 22:15:35 +01:00
  • 6c3f6fd57f Update freebsd.inc.php Chris Energia Positiva 2015-01-26 22:09:47 +01:00
  • 533279ec25 Create usr_local_etc_pureftpd-mysql.conf Chris Energia Positiva 2015-01-26 22:07:39 +01:00
  • 68d678aff8 Create usr_local_etc_pure-ftpd.conf Chris Energia Positiva 2015-01-26 22:06:12 +01:00
  • 6767edfaff Merge branch 'master' of github.com:Froxlor/Froxlor Roman Schmerold (BNoiZe) 2015-01-26 17:20:05 +01:00
  • b1acc9a8ef Make the side navigation more styleable Roman Schmerold (BNoiZe) 2015-01-26 17:19:40 +01:00
  • 16dde03f96 get rid of almost never used HTMLPurifier library and beautify subject display on ticket-overview Michael Kaufmann (d00p) 2015-01-25 08:34:03 +01:00
  • 5a7462972f revert commit 84ff476dfa from Lednerb, as the cron-reload command is being read from the settings (and can be adjusted) Michael Kaufmann (d00p) 2015-01-22 08:19:50 +01:00
  • 4c60b40c64 Merge pull request #220 from Lednerb/master Dessa 2015-01-22 07:51:12 +01:00
  • 90bcaee2c9 Merge pull request #202 from antedaxara/rhel7 Dessa 2015-01-22 07:50:56 +01:00
  • a4973c9c38 don't add rewritecond for https off if this is a ssl-vhost Michael Kaufmann (d00p) 2015-01-21 16:51:36 +01:00
  • 6c39ac80e6 Optimized images Roman Schmerold (BNoiZe) 2015-01-16 21:16:50 +01:00
  • 979c5e7c0c Tidied up the code Roman Schmerold (BNoiZe) 2015-01-16 21:11:17 +01:00
  • 2250b3c37a show custom-notes correctly on admin/customer index when activated + tiny fixes, refs #1471 Michael Kaufmann (d00p) 2015-01-15 22:19:28 +01:00
  • e578a29058 add option to display the custom-notes to the user and actually save the custom-note Michael Kaufmann (d00p) 2015-01-15 22:10:37 +01:00
  • 4c50d35945 Merge branch 'master' of github.com:Froxlor/Froxlor Michael Kaufmann (d00p) 2015-01-15 21:30:35 +01:00
  • 7b8885c05e add custom-notes field to admins and customers, fixes #1471 Michael Kaufmann (d00p) 2015-01-15 21:30:15 +01:00
  • 1e6df86b7b Add new small info icon Roman Schmerold (BNoiZe) 2015-01-15 20:27:11 +01:00
  • 4e9b2d0e97 replace DB_SRV with the hostname/ip and not the caption of the mysql-server, thx to rzeka for noticing Michael Kaufmann (d00p) 2015-01-15 17:29:49 +01:00
  • 67f3263a2e Don't remove custom comments, add newline after blocks Roman Schmerold (BNoiZe) 2015-01-14 00:20:04 +01:00
  • f61567be81 Changed the way php-fpm is included, fixes #1427 Roman Schmerold (BNoiZe) 2015-01-13 20:37:57 +01:00
  • 3ee8f6ac25 use generatePassword() for generating passwords as it respects the settings; fix user-modification under freebsd as there is no 'usermod' Michael Kaufmann (d00p) 2015-01-12 20:24:55 +01:00
  • 5eb630d858 Merge pull request #6 from Lednerb/testing-1 Sascha Brendel 2015-01-12 14:36:14 +01:00
  • e7d07c7924 Deleted unnecessary config template Lednerb 2015-01-12 14:32:00 +01:00
  • ab44d27914 Deleted unnecessary config prompts Lednerb 2015-01-12 14:25:10 +01:00
  • 1889958e2b added missing php5-cli to installation script Lednerb 2015-01-11 22:19:49 +01:00
  • b78729319c added logging to integry-check so admins know what exactly was wrong when monkeys ate the integrity :) Michael Kaufmann (d00p) 2015-01-11 20:32:18 +01:00
  • 7d478fd378 dovecot Installation angepasst Lednerb 2015-01-11 16:36:50 +01:00
  • 1cb237e8e1 Test zum Entfernen Lednerb 2015-01-11 16:01:58 +01:00
  • 8a3745aee8 updated service restart at courier imap/pop3 server Lednerb 2015-01-11 15:42:01 +01:00
  • 84ff476dfa check Cron reload config Lednerb 2015-01-11 13:22:35 +01:00
  • b3935bfda8 Merge branch 'master' of github.com:Froxlor/Froxlor Michael Kaufmann (d00p) 2015-01-11 09:31:49 +01:00
  • 2ae64d0abe Added Trusty Lednerb 2015-01-11 00:06:14 +01:00
  • e21b923194 Added Ubuntu 14.04 Trusty, didn't check if the configfiles are working Lednerb 2015-01-10 23:46:37 +01:00
  • 9ab90aa3b9 Merge pull request #219 from Lednerb/master Michael Kaufmann 2015-01-10 18:19:14 +01:00
  • 797db9aa8b Merge pull request #5 from Lednerb/patch-8 Sascha Brendel 2015-01-10 18:15:04 +01:00
  • 982421b9b3 Merge pull request #4 from Lednerb/patch-7 Sascha Brendel 2015-01-10 18:14:44 +01:00
  • d0d7e7f369 Merge pull request #3 from Lednerb/patch-4 Sascha Brendel 2015-01-10 18:14:25 +01:00
  • 0b35c833f3 Merge pull request #2 from Lednerb/patch-5 Sascha Brendel 2015-01-10 18:14:03 +01:00
  • aef58921ce Merge pull request #1 from Lednerb/patch-6 Sascha Brendel 2015-01-10 18:13:36 +01:00
  • b681d9ba90 Update swedish.lng.php Sascha Brendel 2015-01-10 18:11:26 +01:00
  • caedb34d00 Update portugues.lng.php Sascha Brendel 2015-01-10 18:09:37 +01:00
  • 251fa70228 Update english.lng.php Sascha Brendel 2015-01-10 18:06:12 +01:00
  • ced2f0c3d4 Update italian.lng.php Sascha Brendel 2015-01-10 17:58:04 +01:00
  • 25514e1030 Merge pull request #217 from Lednerb/patch-2 Michael Kaufmann 2015-01-10 17:28:31 +01:00
  • 196454c7ab Merge pull request #216 from Lednerb/patch-1 Michael Kaufmann 2015-01-10 17:22:01 +01:00
  • 331b65e384 Update french.lng.php Sascha Brendel 2015-01-10 17:20:49 +01:00
  • 794140f3c1 Update english.lng.php Sascha Brendel 2015-01-10 16:52:40 +01:00
  • 22eeeaf231 Update german.lng.php Sascha Brendel 2015-01-10 15:48:14 +01:00
  • aff531a274 set from and reply to from settings in usage-report-mails Michael Kaufmann (d00p) 2015-01-10 07:33:40 +01:00
  • c1ff010283 allow 'localhost' or any local-hostname for db-connection Michael Kaufmann (d00p) 2015-01-08 14:39:52 +01:00
  • bb3376d1aa update Smarty to version 3.1.21 Michael Kaufmann (d00p) 2015-01-07 18:18:16 +01:00
  • bcd49186fb update phpMailer to 5.2.9 Michael Kaufmann (d00p) 2015-01-07 18:12:27 +01:00
  • c0f2745d30 of course, still allow localhost/127.0.0.1 as valid-ip xD Michael Kaufmann (d00p) 2015-01-07 16:34:58 +01:00
  • 64959c75fe clear out whether pcntl extension is not installed or just pcntl_fork is unavailable, fixes #1469 Michael Kaufmann (d00p) 2015-01-07 15:36:35 +01:00
  • 82fdb84e61 give possibility to specify a socket-file as 'host' in userdata.inc.php to connect via mysql-socket instead of hostname; not a setting because this might break some other stuff (mysql-access-hosts -> problems when adding mysql-users/databases, etc.) Michael Kaufmann (d00p) 2015-01-07 15:13:32 +01:00
  • 10acd16e17 Merge pull request #215 from junkpad92/patch-1 Michael Kaufmann 2015-01-06 16:05:41 +01:00
  • 21adfeed89 Update german.lng.php junkpad92 2015-01-06 15:31:51 +01:00
  • 791f12401f Fixing spelling mistake junkpad92 2015-01-06 15:31:08 +01:00
  • 55c7b2aedf use separate escapeshellarg()-calls as it leads to 'group user' as being recognized as the group only 0.9.33-rc1 Michael Kaufmann (d00p) 2015-01-05 18:16:51 +01:00
  • 40d51dc7ef fix possible undefined variable Michael Kaufmann (d00p) 2015-01-04 09:16:19 +01:00
  • 378d66f36a Merge pull request #213 from stweil/master Michael Kaufmann 2014-12-30 17:50:13 +01:00
  • fd26beb941 Improve German translation Stefan Weil 2014-12-30 16:56:21 +01:00
  • c7dc68c848 add froxlor-group to customer-group in case fcgid/fpm is used for froxlor Michael Kaufmann (d00p) 2014-12-30 16:44:52 +01:00
  • 6ae3691f20 dont show apache-needed stuff for php-fpm when not using apache Michael Kaufmann (d00p) 2014-12-30 12:15:18 +01:00
  • 5d5062c262 make ownership-hint a bit larger like the db-error-page; add theme-fallback to database-error-function to avoid this stupid 'we are sorry, but a MySQL - error occurred'-message Michael Kaufmann (d00p) 2014-12-29 21:42:28 +01:00
  • 509033e2b8 put install-css-stuff into the correct install.css file Michael Kaufmann (d00p) 2014-12-29 21:23:21 +01:00
  • 7584b0acc4 remove google-webfont-stuff (just create your own theme or overwrite Sparkle to use another font); remove more inline css and remove unnecessary JS in hints-templates Michael Kaufmann (d00p) 2014-12-29 21:08:01 +01:00
  • dd34ab8d9b fix inline-css (violation of Content Security Policy) Michael Kaufmann (d00p) 2014-12-29 20:48:56 +01:00
  • c6f3b03891 do some sql-minor-fixing, refs #1486 - set version to 0.9.33-rc1 for possible upcoming release-candidate Michael Kaufmann (d00p) 2014-12-29 14:59:58 +01:00
  • d765cc8633 fix possible undefined variable if session timed out after login and re-login with another user Michael Kaufmann (d00p) 2014-12-27 18:35:31 +01:00
  • 4b0507c4d3 secure scripts which should not be called directly (install/update stuff); avoid url-manipulation Michael Kaufmann (d00p) 2014-12-27 15:13:25 +01:00
  • 4523ef87b7 show correct errormessage when sql-prefix is wrong Michael Kaufmann (d00p) 2014-12-23 13:56:49 +01:00
  • 2b55ceba7a rework updateCounters Michael Kaufmann (d00p) 2014-12-22 14:47:56 +01:00
  • b2eeef8d38 beautification and fallback just in case Michael Kaufmann (d00p) 2014-12-22 14:14:53 +01:00
  • d674f4dd70 same alias-ip-stuff when adding a new domain and aliasdomain is selected Michael Kaufmann (d00p) 2014-12-22 13:37:35 +01:00
  • 0406948c4b remove unneeded functions; fix ip-assigning when a domain is an alias of another domain and the ip's from the alias-domain are being read, no check for ssl/non-ssl was made resulting in an integrity constraint violation in the database Michael Kaufmann (d00p) 2014-12-22 13:32:37 +01:00
  • 366e0f6061 various permission fixes when using fcgid / fpm and customerdocroots having 0770 and sockets are 0660 Michael Kaufmann (d00p) 2014-12-22 09:51:55 +01:00
  • 3c12e825f5 fix progress-bar value of >100%; fixes #1467 Michael Kaufmann (d00p) 2014-12-22 08:49:36 +01:00
  • 925afbd03f fix design-issues when no add-link is present in overviews; fixes #1466 Michael Kaufmann (d00p) 2014-12-22 08:06:26 +01:00
  • bfa9478649 password-reset fix Michael Kaufmann (d00p) 2014-12-19 14:11:17 +01:00
  • 19f5f2a7a4 remove static copyright-year in templates; fix possible undefined theme-variable in phpErrHandler by specifying a fallback-default Michael Kaufmann (d00p) 2014-12-19 09:49:33 +01:00
  • c1ca72dd3c fix validation of offset-value in domain import + minor fixes Michael Kaufmann (d00p) 2014-12-19 09:29:25 +01:00
  • 495a48bc87 avoid undefined variable in case the admin has unlimited domain-contingent Michael Kaufmann (d00p) 2014-12-19 07:51:44 +01:00