Florian Aders (EleRas)
|
2d1fd0c8c5
|
Delete old froxlor-theme and automatically move users to CSS - version of theme
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2014-01-01 13:11:27 +01:00 |
|
Florian Aders (EleRas)
|
93d60e4305
|
Only show description for theme variants, not base-theme - name
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-31 10:15:31 +01:00 |
|
Florian Aders (EleRas)
|
e98792a6af
|
froxlor.css: move menuitems closer together
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-30 19:27:50 +01:00 |
|
Florian Aders (EleRas)
|
7f1b696edd
|
Removed double tinyform in change language/password/theme
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-30 19:25:46 +01:00 |
|
Florian Aders (EleRas)
|
25649c2aa9
|
froxlor.css: fixed formatting of formfields
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-30 18:34:12 +01:00 |
|
Florian Aders (EleRas)
|
a2f7025940
|
froxlor.css: fixed corners of add/edit forms
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-30 18:30:02 +01:00 |
|
Florian Aders (EleRas)
|
3e5e4790bf
|
froxlor.css: fixed dashboard - corners
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-30 18:25:14 +01:00 |
|
Florian Aders (EleRas)
|
41263ab031
|
froxlor.css: display menu and content on the same height
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-30 18:17:55 +01:00 |
|
Florian Aders (EleRas)
|
e006a69535
|
Removed a lot of stuff from froxlor.css, load sparkle and modify needed elements for easier maintainabiity
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-30 18:00:02 +01:00 |
|
Florian Aders (EleRas)
|
41b7724d7e
|
Fixed edge-bug in table for froxlor.css
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-30 17:22:22 +01:00 |
|
Michael Kaufmann (d00p)
|
db5a80a7e1
|
fix version-check to display output text again if a newer version is available
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-30 17:14:26 +01:00 |
|
Florian Aders (EleRas)
|
ffac6e38dc
|
Move the froxlor - theme further to css, nearly done
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-30 17:06:36 +01:00 |
|
Michael Kaufmann (d00p)
|
e97e377723
|
fix query when admin/reseller has ips != unlimited, fixes #1345
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-30 15:00:36 +01:00 |
|
Florian Aders (EleRas)
|
18547929ca
|
Fixed typo in aliasdomain - SQL, thx rubber
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-30 08:20:58 +01:00 |
|
Florian Aders (EleRas)
|
813c76d55b
|
Added Froxlor - theme based on sparkle in css
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-29 19:26:10 +01:00 |
|
Roman Schmerold (BNoiZe)
|
3621effb36
|
Fixed a bug where action links where highlighted even if they weren't active
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-29 19:16:22 +01:00 |
|
Florian Aders (EleRas)
|
3d8fa8e7ea
|
Add theme - config for Froxlor until this theme is moved to css-only
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-29 17:43:10 +01:00 |
|
Florian Aders (EleRas)
|
b4a345d182
|
Allow themes to have various variants
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-29 17:35:03 +01:00 |
|
Roman Schmerold (BNoiZe)
|
675e93b99a
|
Added resize plugin to flot, removed inline css
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-29 16:39:47 +01:00 |
|
Roman Schmerold (BNoiZe)
|
34b4aaa828
|
Fixed https not used in passwort reset links, fixes #1344
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-29 15:24:42 +01:00 |
|
Roman Schmerold (BNoiZe)
|
5b7fe8cf88
|
Fixed encoding with new database class, fixes #1343
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-29 15:11:18 +01:00 |
|
Michael Kaufmann (d00p)
|
0fb0d3b2db
|
Merge remote-tracking branch 'origin/0.9.31.2'
|
2013-12-27 16:46:33 +01:00 |
|
Michael Kaufmann (d00p)
|
01d825fc2a
|
set version to 0.9.31.2 for bugfix release
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.31.2
|
2013-12-27 16:20:11 +01:00 |
|
Michael Kaufmann (d00p)
|
9d5d60fa88
|
bugfix squeeze dovecot.conf and correct wheezy dovecot-15-lda.conf, fixes #1334
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-27 16:18:51 +01:00 |
|
Roman Schmerold (BNoiZe)
|
f3b61ce87c
|
Removed unused plugins, added axis labels
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-27 15:00:38 +01:00 |
|
Roman Schmerold (BNoiZe)
|
5cb0256a58
|
Improvements to traffic graphs
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-27 14:13:38 +01:00 |
|
Roman Schmerold (BNoiZe)
|
1539ad1344
|
Fixed a bug which prevented mailtraffic from being written to database
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-27 12:32:12 +01:00 |
|
Michael Kaufmann (d00p)
|
b2ab5629e8
|
fix 'Invalid parameter number' error, thx to an anonymous report
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-26 13:34:03 +01:00 |
|
Roman Schmerold (BNoiZe)
|
166d75454e
|
Minor interface tweaks, removed unused css
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-24 23:06:29 +01:00 |
|
Michael Kaufmann (d00p)
|
0c9d62977c
|
Merge remote-tracking branch 'origin/0.9.31.2'
|
2013-12-24 15:41:33 +01:00 |
|
Michael Kaufmann (d00p)
|
d34515b9e0
|
also add curl check to master-branch, dunno why this was not merged automatically, git is teh shit
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-24 15:35:47 +01:00 |
|
Michael Kaufmann (d00p)
|
da371fa560
|
Merge remote-tracking branch 'origin/0.9.31.2' and fix install-SQL file
|
2013-12-24 15:29:57 +01:00 |
|
Michael Kaufmann (d00p)
|
44ae470d7e
|
add check for optional php-curl extension
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-24 14:43:47 +01:00 |
|
Michael Kaufmann (d00p)
|
2dc0bf2104
|
use better german
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-24 14:36:11 +01:00 |
|
Michael Kaufmann (d00p)
|
3b9727942a
|
we need php-5.3 not 5.2 - check is correct but text was not
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-24 14:34:27 +01:00 |
|
Michael Kaufmann (d00p)
|
cffd16a6a1
|
re-do all the fixes (git screwed up branches, i don't know, this is a clean one now)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-24 10:13:11 +01:00 |
|
Michael Kaufmann (d00p)
|
9fca6a7953
|
don't rely on Database-functions for getting sql/sql_root data in error-reporting
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-24 09:48:57 +01:00 |
|
Michael Kaufmann (d00p)
|
1ec41d0f77
|
when adding subdomains as customer, respect the wwwserveralias and iswildcarddomain setting of the parent domain, also when editing a subdomain as customer, pre-set the values that were entered before
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-23 20:46:10 +01:00 |
|
Michael Kaufmann (d00p)
|
0031e19c70
|
damn automatic merge...stupid thing
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-22 19:24:40 +01:00 |
|
Michael Kaufmann (d00p)
|
99c0bda7f2
|
Merge remote-tracking branch 'origin/0.9.31.1'
|
2013-12-22 19:21:34 +01:00 |
|
Michael Kaufmann (d00p)
|
d831d06da9
|
don't show 'nice' error if no is specified and disguise passwords of sql-accounts, fixes #1336
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-22 18:14:55 +01:00 |
|
Roman Schmerold (BNoiZe)
|
429f748ad8
|
Fixing mailtraffic cron, fixes traffic graph sorting
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-22 10:57:56 +01:00 |
|
Roman Schmerold (BNoiZe)
|
82f3d8d18c
|
Fixes various traffic graph issues
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-20 23:56:48 +01:00 |
|
Roman Schmerold (BNoiZe)
|
308cc0cfb9
|
Fixed a bug which prevented mailtraffic from being shown
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-20 23:36:09 +01:00 |
|
Roman Schmerold (BNoiZe)
|
9acaa94895
|
Fixed mailtraffic not using lastrun time
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-20 23:19:50 +01:00 |
|
Roman Schmerold (BNoiZe)
|
a92cdb2926
|
Added cron for mailtraffic (with EleRas), fixes #69
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-20 23:12:47 +01:00 |
|
Roman Schmerold (BNoiZe)
|
7969edf1b4
|
Added title-tags to buttons, fixes 1328
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-20 19:14:24 +01:00 |
|
Roman Schmerold (BNoiZe)
|
7af7842fe9
|
Merge branch 'master' of github.com:Froxlor/Froxlor
|
2013-12-20 18:28:44 +01:00 |
|
Roman Schmerold (BNoiZe)
|
70dc53db6e
|
Fixed missing template vars
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-20 18:28:36 +01:00 |
|
Michael Kaufmann (d00p)
|
05dad04384
|
add 0.9.31.1 to updater of 0.9.32-dev
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-19 18:30:00 +01:00 |
|