Andre Lorbach defad2dedd Fixed merge conflicts ...

Merge branch 'beta' into devel

Conflicts:

	src/include/functions_common.php

2008-10-07 11:24:06 +02:00

..

admin

Added new description field for logstream sources.

2008-09-25 16:28:08 +02:00

BitstreamVeraFonts

Added Bitstream Vera Fonts into the package, so we have no problems drawing fonts on charts anymore

2008-09-16 11:07:14 +02:00

classes

Added parser for apache2 common format.

2008-10-07 11:19:16 +02:00

css

Increased default Javascript Menu Timeout from 1,5 to 3 seconds.

2008-09-17 17:52:41 +02:00

images

Added MsgParsers for Apache and IIS logfiles

2008-09-18 12:22:03 +02:00

include

Fixed merge conflicts

2008-10-07 11:24:06 +02:00

js

Removed unused files

2008-09-24 15:27:19 +02:00

lang

Added global warning which will be displayed on all pages if a database update is pending

2008-10-02 16:11:24 +02:00

templates

Fixed a race condition in the installer which could cause phpLogCon to fail at Step 8.

2008-10-07 11:05:11 +02:00

themes

Minor tweaks to the css and titles of the chart page

2008-09-11 13:54:58 +02:00

.htaccess

Removed ^M from main php files

2008-05-05 11:42:25 +02:00

asktheoracle.php

Added button below searchfield which becomes visible when you run searches

2008-10-02 17:00:41 +02:00

chartgenerator.php

Made some tweaks to the charts

2008-09-16 13:47:10 +02:00

convert.php

Charts are now also converted and added into the UserDB during install or convert

2008-10-02 14:45:01 +02:00

details.php

Started implementing charts generator and statistic page

2008-09-03 16:20:43 +02:00

export.php

Removed some minor bugs in the new export functions. XML and CVS Export now fully works

2008-08-05 11:37:44 +02:00

index.php

Added button below searchfield which becomes visible when you run searches

2008-10-02 17:00:41 +02:00

install.php

removed debug setting from installer

2008-10-07 11:06:26 +02:00

login.php

Fixed Windows linefeeds in new code files. Added admin lang file into de and pt_BR translation.

2008-07-23 17:31:00 +02:00

search.php

Solved Merge conflicts with beta branch

2008-05-05 11:47:45 +02:00

statistics.php

Added oracle page which helps building usefull search links used within phpLogCon

2008-09-18 18:00:52 +02:00

userchange.php

Added Maximize/Normalize button into the menu.

2008-07-28 15:44:57 +02:00