Andre Lorbach 1d31618de9 Fixed merge issues ...

Merge branch 'devel'

Conflicts:

	ChangeLog

2008-05-19 14:30:43 +02:00

..

classes

Added filtering support for the new Eventlog fields

2008-05-05 17:07:08 +02:00

css

Added new menu links for Event fields to search in our upcoming global repository.

2008-05-06 16:23:07 +02:00

images

Added new menu links for Event fields to search in our upcoming global repository.

2008-05-06 16:23:07 +02:00

include

Fixed merge issues

2008-05-19 14:30:43 +02:00

js

Fixed merge conflicts

2008-05-05 14:44:00 +02:00

lang

Added new menu links for Event fields to search in our upcoming global repository.

2008-05-06 16:23:07 +02:00

templates

Fixed merge conflicts

2008-05-19 13:25:43 +02:00

themes

Added new menu links for Event fields to search in our upcoming global repository.

2008-05-06 16:23:07 +02:00

.htaccess

Removed ^M from main php files

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

details.php

Solved Merge conflicts with beta branch

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

index.php

Added check for installed PHP Version. phpLogCon will refuse to run on PHP4 or lower from now on!

2008-05-19 14:07:58 +02:00

install.php

Fixed merge conflicts

2008-05-19 14:29:44 +02:00

search.php

Solved Merge conflicts with beta branch

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

userchange.php

Solved Merge conflicts with beta branch

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