maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
1,239 Commits 6 Branches 188 Tags
ec537625a56a513026b59444e71bb9dcdb5c2868
Commit Graph

1239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Aders
ec537625a5 Merge pull request #51 from SirUli/master 
Fix for cron_tasks.inc.http.10.apache.php on 1315
 2012-09-25 00:27:17 -07:00
Florian Aders
30b185825c Merge pull request #43 from RipClaw2971/master 
fixes #1118 FastCgiExternalServer: redefinition of previously defined class, thx RipClaw2971
 2012-09-25 00:25:48 -07:00
Uli
bd890e8ebe Fix for cron_tasks.inc.http.10.apache.php on 1315 
Error should have been fixed in #24 but the following error still
occured if $this->settings['phpfpm']['configdir'] is not available:

```
PHP Warning:  readdir() expects parameter 1 to be resource, boolean
given in /var/www/froxlor/scripts/jobs/cron_tasks.inc.http.10.apache.php
on line 1315
```

Structure of the fix is the same as in
f5bc81faca but copied to the other
section.
 2012-09-24 09:10:57 +02:00
Dessa
24fb46b3d7 Merge pull request #49 from chrisv2/fix_postfix_virtual_transport 
fix virtual transport in postfix
 2012-09-23 02:25:07 -07:00
Chris Vigelius
8994029b3e fix virtual transport in postfix 2012-09-22 14:20:50 +02:00
Robert Förster (Dessa)
fc91683f5f drop lenny 
as announced, lenny is no longer supported by us, as upstream has dropped support in February

Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
 2012-09-21 17:50:21 +02:00
Robert Förster (Dessa)
76355f5617 fix last commit (conf -> cfg) 2012-09-21 17:45:49 +02:00
Robert Förster (Dessa)
188e80ab2e fix chmod for libnss config files (the PM should have taken care of that when creating the file already but better safe than sorry) 2012-09-21 17:38:11 +02:00
Dessa
ec032c7a15 Merge pull request #48 from chrisv2/postfix-dovecot-ubuntu1204 
Fix Postfix & Dovecot for Ubuntu 12.04
 2012-09-21 08:34:11 -07:00
Dessa
79ae6da6b5 Merge pull request #47 from chrisv2/libnss-cfg-rename 
with libnss-mysql-bg, configfiles end in .cfg (not .conf)
 2012-09-21 08:33:42 -07:00
Chris Vigelius
977b887e6b revert disable_plaintext_auth which was changed by mistake 2012-09-21 17:27:06 +02:00
Chris Vigelius
2f1bbf7055 fix Postfix and Dovecot for Precise (Ubuntu 12.04) 
- Dovecot config updated for Dovecot2
- postfix delivery method 'dovecot' enabled again
 2012-09-21 17:26:45 +02:00
Chris Vigelius
86457e7a93 with libnss-mysql-bg, configfiles end in .cfg (not .conf) 2012-09-21 17:09:07 +02:00
Andreas Grundler
e6a30edd0b Merge remote-tracking branch 'upstream/master' 2012-09-13 10:30:17 +02:00
Andreas Grundler
e2700ce91d Fix for Bug #1118 2012-08-23 11:32:25 +02:00
Florian Aders
251a2ebd96 Merge pull request #42 from bechtoldt/master 
Use {$header_logo} within login templates
 2012-08-22 05:07:50 -07:00
Arnold Bechtoldt
11e33d855b Use {$header_logo} within login templates 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-22 13:55:54 +02:00
Florian Aders
dcfe3493a2 Merge pull request #37 from Ivaylo-Bachvarov/master 
Bulgarian support, thx to Ivaylo-Bachvarov
 2012-08-22 03:06:19 -07:00
Florian Aders
65cdb2def0 Merge pull request #40 from bechtoldt/ticket1044 
Ticket Center: Link usernames with their user panel, fixes #1044
 2012-08-22 03:04:57 -07:00
Arnold Bechtoldt
7d0ae7ebd2 Ticket Center: Link usernames with their user panel, fixes #1044 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-22 11:55:13 +02:00
Ivaylo Bachvarov
2bb7ac9e06 The whole user interface is now done. 
The pull request is done. For now i don't have enought time to translate
the admin parth. But user interface is more important so i am done with
this.
 2012-08-22 00:49:05 +03:00
Florian Aders
7ba4e6e066 Merge pull request #39 from bechtoldt/ticket1119 
Removing Classic Theme Support, fixes #1119
 2012-08-21 12:35:01 -07:00
Arnold Bechtoldt
19095cb3ae Update theme setting of active sessions (DB:panel_sessions), refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 21:33:13 +02:00
Arnold Bechtoldt
d196b0b5c8 Change theme when Classic Theme in use only. Fix Froxlor SQL file, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 21:25:56 +02:00
Arnold Bechtoldt
5a276dbf8d Removing Classic Theme Support, fixes #1119 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 20:22:45 +02:00
Florian Aders
733cb43f1c Merge pull request #38 from bechtoldt/ticket1114 
Implement *deactivate-catchall*-feature, fixes #1114
 2012-08-21 11:11:38 -07:00
Arnold Bechtoldt
78f286cbda Implement *deactivate-catchall*-feature, refs #fixes 1114 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 20:08:20 +02:00
Florian Aders (EleRas)
3655055030 Removed outdated, not needed file 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2012-08-21 19:25:35 +02:00
Florian Aders
26d93f6308 Merge pull request #36 from bechtoldt/templateoptimization 
Move Froxlor to utf8 and various template - optimizations, fixes #1117
 2012-08-21 10:09:35 -07:00
Arnold Bechtoldt
f6d47fe96c use UTF-8 as charset during mysql connection, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 18:40:38 +02:00
Arnold Bechtoldt
a91e7009db improving language within preconfig (v0.9.28.svn4). T e m p l a t e O p t i m i z a t i o n D o n e, fixes #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 15:32:53 +02:00
Arnold Bechtoldt
c9a93e95aa change SysCP->Froxlor within Slovak lng translation file, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 15:14:34 +02:00
Arnold Bechtoldt
084069aaf4 change SysCP->Froxlor within Swedish lng translation file, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 15:13:40 +02:00
Arnold Bechtoldt
d006c7ecac converting additional Swedish HTML numeric entities to actual chars, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 15:12:16 +02:00
Arnold Bechtoldt
63057fe0ac converting additional Spanish HTML numeric entities to actual chars, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 15:07:22 +02:00
Arnold Bechtoldt
9a406e8cec converting additional Slovak HTML numeric entities to actual chars. Some native speakers have to review some special char errors within this file, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 15:06:09 +02:00
Arnold Bechtoldt
36f8e50453 converting additional Portugues HTML numeric entities to actual chars, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 15:01:13 +02:00
Arnold Bechtoldt
a7689f5a28 converting additional Polish HTML numeric entities to actual chars. Some native speakers have to review some special errors within this file, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 14:56:20 +02:00
Arnold Bechtoldt
92e4e2d826 converting additional Italian HTML numeric entities to actual chars and removing CR's, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 14:51:40 +02:00
Arnold Bechtoldt
8ce991a249 converting additional Hungarian HTML numeric entities to actual chars, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 14:42:32 +02:00
Arnold Bechtoldt
8ab8bc0b42 converting Hungarian HTML numeric entities to actual chars, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 14:40:06 +02:00
Arnold Bechtoldt
861376b2a2 converting French HTML numeric entities to actual chars, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 14:27:28 +02:00
Arnold Bechtoldt
a45b231a7f converting Dutch HTML numeric entities to actual chars, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 14:24:26 +02:00
Arnold Bechtoldt
d9a28d197e converting Czech HTML numeric entities to actual chars, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 14:22:34 +02:00
Arnold Bechtoldt
e1a0cca5cc Don't change PHPMailer core just modify public charset object-var, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 14:12:15 +02:00
Ivaylo Bachvarov
7ac1240640 The error translating is now done 
Still have a lot of translating work  :(
 2012-08-21 13:21:58 +03:00
Ivaylo Bachvarov
b8f1118bbc Improve Bulgarian translation. 
Almost all of the user interface is translated now. And the BG file is
now structured like the orginal Enlish file.
 2012-08-19 02:02:34 +03:00
Arnold Bechtoldt
022d21054c convert data sets to utf8 too when updating to the next version, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-18 11:04:10 +02:00
Arnold Bechtoldt
68308c4fca using more UTF-8, optimized the initial froxlor.sql statements, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-17 15:47:27 +02:00
Arnold Bechtoldt
f575e94ddb converting English HTML [numeric] entities to actual chars, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-16 16:11:30 +02:00