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

793 Commits

Author SHA1 Message Date
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
Lednerb
e7d07c7924 Deleted unnecessary config template 2015-01-12 14:32:00 +01:00
Lednerb
e21b923194 Added Ubuntu 14.04 Trusty, didn't check if the configfiles are working 2015-01-10 23:46:37 +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)
925afbd03f fix design-issues when no add-link is present in overviews; fixes #1466 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-22 08:06:26 +01:00
Michael Kaufmann (d00p)
19f5f2a7a4 remove static copyright-year in templates; fix possible undefined theme-variable in phpErrHandler by specifying a fallback-default 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-19 09:49:33 +01:00
junkpad92
56b652d185 Fixing deprecated Postfix templates & Providing Dovecot2 Sieve-Configs 2014-12-17 17:21:28 +01:00
Michael Kaufmann (d00p)
cd5e8801e4 add domain-bulk-import, fixes #1452 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-15 14:49:34 +01:00
Marco Vogt (vogti)
28b7cd6e90 bugfixing template-variables list when editing mail-templates; refs #496 
Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-12 20:54:59 +01:00
Marco Vogt (vogti)
6bfa95f8a8 Import default subject/body for e-mails templates; fixes #496 
Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-12 19:26:06 +01:00
Roman Schmerold (BNoiZe)
d927ede388 Merge branch 'master' of github.com:Froxlor/Froxlor 2014-12-02 17:28:38 +01:00
Roman Schmerold (BNoiZe)
6f5f69db2b Made tablesorter work without inline-js 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-12-02 17:27:41 +01:00
Robin Kluth
c58446359c Update templates_edit.tpl 
Replaced <i> with <em> to match the rest of the form
 2014-11-30 12:19:04 +01:00
Robin Kluth
dc5e13d13c Update templates_add_2.tpl 
Replaced <i> with <em> to match the rest of the form
 2014-11-30 12:17:14 +01:00
Roman Schmerold (BNoiZe)
b1a9c2bf49 Disabling unsafe-inline for security again 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-11-28 09:12:14 +01:00
Roman Schmerold (BNoiZe)
a1625d1768 Removed another unused image... doh 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-11-27 21:45:42 +01:00
Roman Schmerold (BNoiZe)
1e0cc86288 Removed unneeded header image 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-11-27 21:41:10 +01:00
Michael Kaufmann (d00p)
e7f54503c1 fix template-variable for 'forgot password', thx to Nepstar for noticing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-17 10:47:24 +01:00
junkpad92
329197902e Fix Safari checkbox-bug 
If checkbox is focused (clicking in the checkbox) checkbox shifts downward. I think: Only in Safari on Yosemite. Other browsers not affected.
 2014-11-03 18:56:23 +01:00
Roman Schmerold (BNoiZe)
911d3769f6 Added froxlor logo to footer 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-10-11 14:22:51 +02:00
Roman Schmerold (BNoiZe)
3f3a02147b Update copyright in standard customer index 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-10-11 14:16:19 +02:00
Ante
34f20ffd1a Added RHEL 7 configfiles 2014-09-30 11:07:37 +02:00
HolySephi
6f974c035d Update etc_libnss-mysql.cfg 2014-09-06 08:18:45 +02:00
HolySephi
3c091f9cce Update etc_libnss-mysql.cfg 2014-09-06 08:17:48 +02:00
HolySephi
b2268861b0 Update usr_local_etc_libnss-mysql.cfg 2014-09-06 08:16:47 +02:00
HolySephi
4b5b9e8d1c Update etc_libnss-mysql.cfg 2014-09-06 08:16:03 +02:00
Michael Kaufmann (d00p)
80a2b5da34 correct precise postfix-master.cf config-template 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-07-19 14:40:26 +02:00
Michael Kaufmann (d00p)
3fe10d8d3d merge pull request #193 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-06-02 09:15:45 +02:00
Roman Schmerold (BNoiZe)
9b0cc70542 Fix height of #maincontent if newsfeed is shown 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 22:02:48 +02:00
Roman Schmerold (BNoiZe)
38599ec4b9 Read the custom RSS directly from the settings 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 21:55:10 +02:00
Roman Schmerold (BNoiZe)
7d4ea57381 Removing obsolete 'language' attribute from script-tags 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 19:12:14 +02:00
Roman Schmerold (BNoiZe)
538b99055c Removing unwanted files which should be ignored by git anyway 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 18:50:55 +02:00
Roman Schmerold (BNoiZe)
3acfcd4a95 Adding a custom newsfeed to the customer-dashboard, fixes #1408 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 18:46:15 +02:00
Robert Förster (Dessa)
73acfb5d7c update js folder 
- add images from jquery-ui to css folder, the stylesheet expects them being around even though we don't use them, adding them and not using them is better then editing the stylesheet and then forgetting about it again after every jquery-ui update, i suppose..
- fix html5shiv name, it was minified to begin with
- bump flot to 0.8.3, fix plugin name (no functional changes for us)
- bump tablesorter to 2.16.4 (likewise)
 2014-05-20 19:50:57 +02:00
Roman Schmerold (BNoiZe)
c15fb4043b Removed unneeded height setting on checkboxes 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-05-07 13:59:53 +02:00
Michael Kaufmann (d00p)
07e5385fa2 merging pull-request #187, set log format for dovecot in froxlor config and updated German translations 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-05-07 09:13:44 +02:00
Roman Schmerold (BNoiZe)
8b7dc057e1 Removed linebreak after checkboxes, fixes #1397 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-03-19 13:16:16 +01:00
Roman Schmerold (BNoiZe)
d10a2764af Improving display of new ticket icon 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-03-01 16:21:13 +01:00
Roman Schmerold (BNoiZe)
125b648af7 Made the headers in froxlor theme a little more pleasent to view 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-12 10:01:52 +01:00
Roman Schmerold (BNoiZe)
97154d2065 Fixed dashboard table header in Froxlor theme 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-12 09:50:39 +01:00
Florian Aders (EleRas)
b4b80dd0cf Add integritycheck for ssl_redirect where parentdomains have no SSL (leftovers from a bug recently fixed by d00p) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-11 19:17:25 +01:00
Florian Aders (EleRas)
e3e4dba90d Added manuel integritycheck for admins 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-11 16:40:53 +01:00
Roman Schmerold (BNoiZe)
b5a3567238 D'oh, forgot to redo the customer dashboard 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-08 17:47:43 +01:00