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

159 Commits

Author SHA1 Message Date
BNoiZe
9d66507050 history.go(-1) fix 2013-10-15 15:10:10 +02:00
Michael Kaufmann (d00p)
e1fa5f6f0a don't link to index.php on sql-error but rather to the page before the error 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-14 09:49:47 +02:00
Michael Kaufmann (d00p)
8c8cb5a0d7 remove sort-by-path as it does not work anyway (and makes not much sense), fixes #692 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 16:43:46 +02:00
Michael Kaufmann (d00p)
92243991bc finally output a nice error-message on mysql-errors 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 12:59:43 +02:00
Michael Kaufmann (d00p)
26885b0f35 improved error-message on incorrect ownership of lib/userdata.inc.php; set correct copyright in hint-templates; beautify code in lib/init.php 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 11:51:26 +02:00
BNoiZe
521acfbe5c Added unlock link and greyed out customer if deactivated 2013-10-05 20:06:23 +02:00
Michael Kaufmann (d00p)
10dc017dd1 add phpinfo() in admin-panel, thx to EleRas; fixes #1270 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-02 09:48:24 +02:00
BNoiZe
f44395a001 Fixed css 2013-10-01 22:00:37 +02:00
Michael Kaufmann (d00p)
b19e226609 fix webftp template (Froxlor and Sparkle theme) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 18:44:09 +02:00
Michael Kaufmann (d00p)
2ca9420bd4 don't show form to add e-mail addresses if no domain exists 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 16:11:19 +02:00
Michael Kaufmann (d00p)
9d43e64610 domain-hascert state 3 is non-existent, it should be 0, thx EleRas 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 19:29:24 +02:00
Michael Kaufmann (d00p)
0b0a515124 show either if domain has a global certificate (via ip/port), a shared certificate (via parentdomain) or it's own certificate (customer-entered), thx to Nico for the artwork 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 18:40:25 +02:00
Michael Kaufmann (d00p)
86d3cf794c re-add ssl.png-icon as it is still used (ssleditor), thx Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-27 17:14:57 +02:00
Michael Kaufmann (d00p)
0727a6bf7b show whether ssl-certs are given for a domain by red or green icon in customer-domains, thx to nico for the icon-work 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-27 11:03:21 +02:00
Michael Kaufmann (d00p)
2a396ffb31 enhance master-cronjob parameter usage, you can now use --force-[cronname] to force any cronjob you like; now show mailbox sizes of emial accounts in the customers email overview, fixes #1007 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 16:58:27 +02:00
Robert Förster (Dessa)
bdd2ca2300 embed html5shiv.js locally instead of using a (probably) unreliable source (which also updates it to 3.6.2 final) 2013-09-22 20:35:09 +02:00
Robert Förster (Dessa)
8a5c9dd03b update css folder, use minified versions as we do not change them 2013-09-22 20:35:09 +02:00
Michael Kaufmann (d00p)
9e405dafce merge tilman19-master branch (multistack support) - note: this is a very early stage, don't expect everything to work 100%, use at your own risk. Testers are very very welcome (only apache2 and nginx (even more testing) so far) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-19 19:36:06 +02:00
Michael Kaufmann (d00p)
e4a4755ed0 add missing icon, thx to novaflash 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-07-19 12:08:45 +02:00
Michael Kaufmann
69e2c7dee1 Merge pull request #101 from 23networks/master 
"White text on light background"-fix
 2013-07-04 10:24:01 -07:00
Michael Kaufmann (d00p)
68fb822160 give possibility to change php.ini-values for fpm-pool configurations (only pre-defined sections are possible for now), refs #587 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-07-03 11:34:34 +02:00
Johannes Matheis
c00edd399e override fg color to obtain readability 2013-07-03 08:47:42 +00:00
Michael Kaufmann (d00p)
42b201c54d prepare ssl-per-domain (customer setable), no cronjob-functionality yet (intended), refs #365 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-14 17:26:30 +02:00
Tilman Klaeger (tilman19)
80f19c7dfb Add multistack options to userpanel, fixes #586 2013-04-29 09:06:40 +02:00
Michael Kaufmann (d00p)
fb4c809ba4 forgot the extra panel on admin-index 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-25 20:00:49 +02:00
Michael Kaufmann (d00p)
fe1ad85d29 auto-height parent-container if info-panels on customer-index are too big, fixes #1198 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-25 19:58:01 +02:00
Michael Kaufmann (d00p)
1ae7876e44 provide a correct user-salutation for all templates, thanks to Shortie 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-19 11:56:53 +02:00
Michael Kaufmann (d00p)
4e41fd84fe only build dialog if needed 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-27 13:05:28 +01:00
Michael Kaufmann (d00p)
cce3c0fde3 don't make documentroot include domain-name by default (forgot on update); remove possible undefined index; beautification for template-forms, thx to monumentum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-22 18:51:12 +01:00
madmuffin1
4675bfe2b9 * removed more backreferences in language files (refs #1171) 2013-03-21 21:50:17 +01:00
Michael Kaufmann (d00p)
74c5d0718c remove php's safe_mode as it is deprecated since php-5.3 and removed since php-5.4 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-15 09:34:41 +01:00
Michael Kaufmann (d00p)
56cc714c2a the link to open the customer-traffic details via admin-panel now uses rel='external' as we do with switch-user 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 08:45:01 +01:00
Michael Kaufmann (d00p)
be11f81af4 minor fixes in installation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-09 16:26:07 +01:00
Michael Kaufmann (d00p)
92aea9d27e fix font-stuff on installation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-05 13:36:24 +01:00
Michael Kaufmann (d00p)
afd16138e4 remove stupid joke 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-25 20:58:24 +01:00
Michael Kaufmann (d00p)
d9ac3b535e make the panel more customizable by letting the admin use a google-webfont for it 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
 2013-02-25 20:54:24 +01: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
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
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
Arnold Bechtoldt
a9dfdb7432 reverting some movements. common css/js should be placed in a common directory 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-16 11:32:34 +02:00
Arnold Bechtoldt
31e24050bf fixing some paths within the installer. adding favicon to the installer page. 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-15 15:06:02 +02:00
Arnold Bechtoldt
b1df344390 removing an unecessary variable in webftp and adding favicon to the webftp template 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-14 23:14:54 +02:00
Arnold Bechtoldt
601bf68d09 Implementing the whole template system using Smarty. This commit includes movements of ROOT/js, ROOT/images, etc. to theme specific directories like templates/<THEME>/. If you are attemping to use your own templates you won't need to modify Froxlor's core files. This commit may require additional work. 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-14 23:08:25 +02:00
Michael Kaufmann (d00p)
40d68df86b Fix jquery-ui.css inclusion in templates/Froxlor/header.tpl 2012-06-22 09:29:23 +02:00
Florian Aders
8f4f0b106b Merge pull request #16 from dschallert/Bug_#693_hide_empty_information_in_customer_control_panel_index 
fixes #693 Hide empty information on customerpanel index
 2012-05-22 23:39:57 -07:00
wittich
b5556d4f93 Caused by the update from admin_admins.php 2012-05-22 18:51:42 -07:00
dschallert
0d392d64b2 Bug #693 Hide empty information on customerpanel index 2012-05-08 23:17:37 +02:00
Arnold Bechtoldt
6b986375e7 Replace <br> through to the uniform <br /> in the whole code 2012-03-08 17:34:01 +01:00
Arnold Bechtoldt
832c5d3c89 Use a symlink to access jquery-ui file, refs #1010 2012-03-08 15:40:45 +01:00
Arnold Bechtoldt
3e615f0b68 Just added a comment, refs #1010 2012-03-08 15:29:57 +01:00