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 |
|
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 |
|
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 |
|
Michael Kaufmann (d00p)
|
b3935bfda8
|
Merge branch 'master' of github.com:Froxlor/Froxlor
|
2015-01-11 09:31:49 +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 |
|
Michael Kaufmann (d00p)
|
aff531a274
|
set from and reply to from settings in usage-report-mails
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2015-01-10 07:33:40 +01:00 |
|
Michael Kaufmann (d00p)
|
c1ff010283
|
allow 'localhost' or any local-hostname for db-connection
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2015-01-08 14:39:52 +01:00 |
|
Michael Kaufmann (d00p)
|
bb3376d1aa
|
update Smarty to version 3.1.21
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2015-01-07 18:18:16 +01:00 |
|
Michael Kaufmann (d00p)
|
bcd49186fb
|
update phpMailer to 5.2.9
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2015-01-07 18:12:27 +01:00 |
|
Michael Kaufmann (d00p)
|
c0f2745d30
|
of course, still allow localhost/127.0.0.1 as valid-ip xD
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2015-01-07 16:34:58 +01:00 |
|
Michael Kaufmann (d00p)
|
64959c75fe
|
clear out whether pcntl extension is not installed or just pcntl_fork is unavailable, fixes #1469
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2015-01-07 15:36:35 +01:00 |
|
Michael Kaufmann (d00p)
|
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.)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2015-01-07 15:13:32 +01:00 |
|
Michael Kaufmann
|
10acd16e17
|
Merge pull request #215 from junkpad92/patch-1
Fixing spelling mistake
|
2015-01-06 16:05:41 +01:00 |
|
junkpad92
|
21adfeed89
|
Update german.lng.php
|
2015-01-06 15:31:51 +01:00 |
|
junkpad92
|
791f12401f
|
Fixing spelling mistake
|
2015-01-06 15:31:08 +01:00 |
|
Michael Kaufmann (d00p)
|
55c7b2aedf
|
use separate escapeshellarg()-calls as it leads to 'group user' as being recognized as the group only
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.33-rc1
|
2015-01-05 18:16:51 +01:00 |
|
Michael Kaufmann (d00p)
|
40d51dc7ef
|
fix possible undefined variable
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2015-01-04 09:16:19 +01:00 |
|
Michael Kaufmann
|
378d66f36a
|
Merge pull request #213 from stweil/master
Improve German translation
|
2014-12-30 17:50:13 +01:00 |
|
Stefan Weil
|
fd26beb941
|
Improve German translation
* Grammar fix dass -> das.
* Consistent spelling Email -> E-Mail.
* Typo Addresse -> Adresse.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
2014-12-30 16:56:21 +01:00 |
|
Michael Kaufmann (d00p)
|
c7dc68c848
|
add froxlor-group to customer-group in case fcgid/fpm is used for froxlor
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2014-12-30 16:44:52 +01:00 |
|
Michael Kaufmann (d00p)
|
6ae3691f20
|
dont show apache-needed stuff for php-fpm when not using apache
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2014-12-30 12:15:18 +01:00 |
|
Michael Kaufmann (d00p)
|
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
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2014-12-29 21:42:28 +01:00 |
|
Michael Kaufmann (d00p)
|
509033e2b8
|
put install-css-stuff into the correct install.css file
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2014-12-29 21:23:21 +01:00 |
|
Michael Kaufmann (d00p)
|
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
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2014-12-29 21:08:01 +01:00 |
|
Michael Kaufmann (d00p)
|
dd34ab8d9b
|
fix inline-css (violation of Content Security Policy)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2014-12-29 20:48:56 +01:00 |
|
Michael Kaufmann (d00p)
|
c6f3b03891
|
do some sql-minor-fixing, refs #1486 - set version to 0.9.33-rc1 for possible upcoming release-candidate
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2014-12-29 14:59:58 +01:00 |
|