maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,434 Commits 6 Branches 188 Tags
7b8341d826fbaa1b4ae840465a36a0f57bb1e82a
Commit Graph

2434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
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 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-27 11:09:27 +01:00
Michael Kaufmann
9d008efabc Merge pull request #224 from heaven73/master 
Pure-FTPd template for FreeBSD
 2015-01-26 22:15:35 +01:00
Chris Energia Positiva
6c3f6fd57f Update freebsd.inc.php 2015-01-26 22:09:47 +01:00
Chris Energia Positiva
533279ec25 Create usr_local_etc_pureftpd-mysql.conf 2015-01-26 22:07:39 +01:00
Chris Energia Positiva
68d678aff8 Create usr_local_etc_pure-ftpd.conf 2015-01-26 22:06:12 +01:00
Roman Schmerold (BNoiZe)
6767edfaff Merge branch 'master' of github.com:Froxlor/Froxlor 2015-01-26 17:20:05 +01:00
Roman Schmerold (BNoiZe)
b1acc9a8ef Make the side navigation more styleable 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-26 17:19:40 +01:00
Michael Kaufmann (d00p)
16dde03f96 get rid of almost never used HTMLPurifier library and beautify subject display on ticket-overview 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-25 08:34:03 +01:00
Michael Kaufmann (d00p)
5a7462972f revert commit 84ff476dfa from Lednerb, as the cron-reload command is being read from the settings (and can be adjusted) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-22 08:19:50 +01:00
Dessa
4c60b40c64 Merge pull request #220 from Lednerb/master 
Ubuntu 14.04 Integration
 2015-01-22 07:51:12 +01:00
Dessa
90bcaee2c9 Merge pull request #202 from antedaxara/rhel7 
Added RHEL 7 configfiles
 2015-01-22 07:50:56 +01:00
Michael Kaufmann (d00p)
a4973c9c38 don't add rewritecond for https off if this is a ssl-vhost 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-21 16:51:36 +01:00
Roman Schmerold (BNoiZe)
6c39ac80e6 Optimized images 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-16 21:16:50 +01:00
Roman Schmerold (BNoiZe)
979c5e7c0c Tidied up the code 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-16 21:11:17 +01:00
Michael Kaufmann (d00p)
2250b3c37a show custom-notes correctly on admin/customer index when activated + tiny fixes, refs #1471 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 22:19:28 +01:00
Michael Kaufmann (d00p)
e578a29058 add option to display the custom-notes to the user and actually save the custom-note 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 22:10:37 +01:00
Michael Kaufmann (d00p)
4c50d35945 Merge branch 'master' of github.com:Froxlor/Froxlor 2015-01-15 21:30:35 +01:00
Michael Kaufmann (d00p)
7b8885c05e add custom-notes field to admins and customers, fixes #1471 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 21:30:15 +01:00
Roman Schmerold (BNoiZe)
1e6df86b7b Add new small info icon 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-15 20:27:11 +01:00
Michael Kaufmann (d00p)
4e9b2d0e97 replace DB_SRV with the hostname/ip and not the caption of the mysql-server, thx to rzeka for noticing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 17:29:49 +01:00
Roman Schmerold (BNoiZe)
67f3263a2e Don't remove custom comments, add newline after blocks 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-14 00:20:04 +01:00
Roman Schmerold (BNoiZe)
f61567be81 Changed the way php-fpm is included, fixes #1427 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-13 20:37:57 +01:00
Michael Kaufmann (d00p)
3ee8f6ac25 use generatePassword() for generating passwords as it respects the settings; fix user-modification under freebsd as there is no 'usermod' 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-12 20:24:55 +01:00
Sascha Brendel
5eb630d858 Merge pull request #6 from Lednerb/testing-1 
Testing 1
 2015-01-12 14:36:14 +01:00
Lednerb
e7d07c7924 Deleted unnecessary config template 2015-01-12 14:32:00 +01:00
Lednerb
ab44d27914 Deleted unnecessary config prompts 2015-01-12 14:25:10 +01:00
Lednerb
1889958e2b added missing php5-cli to installation script 2015-01-11 22:19:49 +01:00
Michael Kaufmann (d00p)
b78729319c added logging to integry-check so admins know what exactly was wrong when monkeys ate the integrity :) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-11 20:32:18 +01:00
Lednerb
7d478fd378 dovecot Installation angepasst 2015-01-11 16:36:50 +01:00
Lednerb
1cb237e8e1 Test zum Entfernen 2015-01-11 16:01:58 +01:00
Lednerb
8a3745aee8 updated service restart at courier imap/pop3 server 2015-01-11 15:42:01 +01:00
Lednerb
84ff476dfa check Cron reload config 2015-01-11 13:22:35 +01:00
Michael Kaufmann (d00p)
b3935bfda8 Merge branch 'master' of github.com:Froxlor/Froxlor 2015-01-11 09:31:49 +01:00
Lednerb
2ae64d0abe Added Trusty 2015-01-11 00:06:14 +01:00
Lednerb
e21b923194 Added Ubuntu 14.04 Trusty, didn't check if the configfiles are working 2015-01-10 23:46:37 +01:00
Michael Kaufmann
9ab90aa3b9 Merge pull request #219 from Lednerb/master 
Updated language files
 2015-01-10 18:19:14 +01:00
Sascha Brendel
797db9aa8b Merge pull request #5 from Lednerb/patch-8 
Update swedish.lng.php
 2015-01-10 18:15:04 +01:00
Sascha Brendel
982421b9b3 Merge pull request #4 from Lednerb/patch-7 
Update portugues.lng.php
 2015-01-10 18:14:44 +01:00
Sascha Brendel
d0d7e7f369 Merge pull request #3 from Lednerb/patch-4 
Update french.lng.php
 2015-01-10 18:14:25 +01:00
Sascha Brendel
0b35c833f3 Merge pull request #2 from Lednerb/patch-5 
Update italian.lng.php
 2015-01-10 18:14:03 +01:00
Sascha Brendel
aef58921ce Merge pull request #1 from Lednerb/patch-6 
Patch 6
 2015-01-10 18:13:36 +01:00
Sascha Brendel
b681d9ba90 Update swedish.lng.php 2015-01-10 18:11:26 +01:00
Sascha Brendel
caedb34d00 Update portugues.lng.php 
removed duplicated entry
 2015-01-10 18:09:37 +01:00
Sascha Brendel
251fa70228 Update english.lng.php 2015-01-10 18:06:12 +01:00
Sascha Brendel
ced2f0c3d4 Update italian.lng.php 
Removed duplicated entries
 2015-01-10 17:58:04 +01:00
Michael Kaufmann
25514e1030 Merge pull request #217 from Lednerb/patch-2 
Update english.lng.php
 2015-01-10 17:28:31 +01:00
Michael Kaufmann
196454c7ab Merge pull request #216 from Lednerb/patch-1 
Update german.lng.php
 2015-01-10 17:22:01 +01:00
Sascha Brendel
331b65e384 Update french.lng.php 
Commented & Removed doubled entries.
The uncommented versions were the newer ones.
 2015-01-10 17:20:49 +01:00
Sascha Brendel
794140f3c1 Update english.lng.php 
Removed multiple definitions.
If in doubt, more recent entries have been used.
 2015-01-10 16:52:40 +01:00
Sascha Brendel
22eeeaf231 Update german.lng.php 
Doppelte Einträge entfernt, im Zweifelsfall aktuellere Einträge übernommen.
 2015-01-10 15:48:14 +01:00