maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
4,946 Commits 6 Branches 188 Tags
03df082cf2b06730b7db8098e9c8e8437709d6e7
Commit Graph

326 Commits

Author SHA1 Message Date
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
Arnold Bechtoldt
d51551989d fixed typo in last commit, refs #1010 2012-03-08 15:14:42 +01:00
Arnold Bechtoldt
454b48f9a8 Provide setting and log rotation for special logfiles after creating domains, fixes #1010 2012-03-08 15:11:25 +01:00
Florian Aders (EleRas)
ec06768303 Fixed APS template bug, patch by arnoldB, fixes #700 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2012-02-27 19:38:29 +01:00
Florian Aders (EleRas)
4ab80e6144 Corrected year in some copyrights and templates 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2012-01-02 14:36:48 +01:00
Florian Aders (EleRas)
fdb633d786 Fixed jquery - paths in templates and removed duplicate jquery.min.js 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-12-22 10:26:08 +01:00
Florian Aders (EleRas)
c10320ff9c Don't display empty reload - command, fixes #940 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-11-12 10:03:39 +01:00
Andreas Burchert (scarya)
450fff57ff Fix for APS instance overview, fixes #111 
Thanks to philnate

Signed-off-by: Andreas Burchert (scarya) <scarya@froxlor.org>
 2011-10-18 13:37:01 +02:00
Florian Aders (EleRas)
36faeb3f09 Moved customer - traffic - charts to JS and with this fixing the display - errors, refs #696 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-10-07 11:54:45 +02:00
Florian Aders (EleRas)
70a077da48 fixed resourcebars, thx philnate, fixes #787 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-10-04 11:21:38 +02:00
Christoph Burchert (Chb)
418990e271 Fixes fix 
Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>
 2011-09-26 03:47:12 +02:00
Andreas Burchert (scarya)
84f00a2519 Fixes malformed priority in ticket archive search, fixes #714 
Note: swedish could not be fixed and my swedish is way to bad to do it on my own
Thanks to philnate
 2011-09-19 11:11:26 +02:00
Florian Aders (EleRas)
5d2d1ffa1a Improve showing of MySQL - databasesize, refs #834, thx arnoldB 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-09-09 10:33:33 +02:00
Florian Aders (EleRas)
e636e6eb39 Show database-size in database-overview, fixes #834 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-09-08 14:46:01 +02:00
Florian Aders (EleRas)
86ac4708f0 Adding a favicon, fixes #875 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-09-08 12:49:17 +02:00
Florian Aders (EleRas)
3a7b7c1300 Improved description of values in admin panel, thx philnate, fixes #743 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-09-06 08:15:44 +02:00
Florian Aders (EleRas)
5bb3c16312 Fixed a few bugs in the WebFTP and allowing optional SSL - connection to the server 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-08-07 14:35:57 +02:00
Florian Aders (EleRas)
3861917dbc Fixed an XSS in WebFTP (positive sideeffect: less HTML in the PHP - code ;)), the tomreyn 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-07-16 09:52:55 +02:00
Florian Aders (EleRas)
bf9306c641 Fixed typo which prevented to upload files in webftp, fixes #842 @0h1m 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-07-13 12:16:05 +02:00
Florian Aders (EleRas)
44a53492e6 Moving to smarty - escaping in webftp, refs #819 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 11:09:44 +02:00
Florian Aders (EleRas)
9aa86e1dee Show warnings if login failed, optimized handling of data in session, refs #819 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 10:47:29 +02:00
Florian Aders (EleRas)
961aad43d1 Added first rework of webftp - module, please not, this still needs a hell lot of work, but anyway: fixes #819 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 10:30:59 +02:00
Florian Aders (EleRas)
0fa64ea943 Fixed small bug in JS and navigation - element - template 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 01:04:59 +02:00
Florian Aders (EleRas)
cc26584f01 Updated jquery to jquery-1.6.1.min.js 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-16 20:05:14 +02:00
Florian Aders (EleRas)
8131e9e92c Just beautification 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-16 19:06:49 +02:00
Florian Aders (EleRas)
3e21cb0298 Moved inline - javascript to external file in preparation of X-Content-Security-Policy (also, the code looks cleaner, yay) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-16 18:59:16 +02:00
Florian Aders (EleRas)
b9bb1a1286 A bit better ticket-delete - view (not 100% sufficient, but better than nothing) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-14 19:10:38 +02:00
Florian Aders (EleRas)
d593a217a4 Moved autoresponder - templates to own directory (now following correct schema) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-14 18:41:18 +02:00
Florian Aders (EleRas)
960fa58799 Renamed ticket - templates to follow the rest of the Froxlor scheme: templatedir = <section> = [admin|customer]_<section>.php 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-14 18:34:43 +02:00
Florian Aders (EleRas)
3669822064 Missing linker-links in traffic - files fixed 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 21:12:31 +02:00
Florian Aders (EleRas)
b68f9fe395 Implemented linker - class for admin_setting.php (resource-recalculation) (templates only) 2011-06-13 21:05:52 +02:00
Florian Aders (EleRas)
e101d01e11 Implemented linker - class for customer_tickets.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:56:08 +02:00
Florian Aders (EleRas)
bdce761af0 Implemented linker - class for customer_traffic.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:54:02 +02:00
Florian Aders (EleRas)
784d1a62f7 Implemented linker - class for customer_mysql.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:53:29 +02:00