222 Commits

Author SHA1 Message Date
Andre Lorbach
20e028f540 Merge branch 'devel' 2008-05-19 15:23:53 +02:00
Andre Lorbach
512d66d3d0 Fixed merge issues
Merge branch 'beta' into devel

Conflicts:

	ChangeLog
	src/include/functions_common.php
2008-05-19 15:23:18 +02:00
Andre Lorbach
4b41f9bf9f Added link to our new knowledge base repository, and added changelog entry! v2.1.6 2008-05-19 15:17:06 +02:00
Andre Lorbach
3ef3ce9590 Merge branch 'devel' 2008-05-19 15:03:45 +02:00
Andre Lorbach
e606641dc2 Merge branch 'beta' into devel 2008-05-19 15:02:20 +02:00
Andre Lorbach
dd0da349bb Fixed filter bug, if you want to filter with ":", you can do this by using "\:" now. 2008-05-19 15:01:41 +02:00
Andre Lorbach
b9653858fd Merge branch 'beta' 2008-05-19 14:34:58 +02:00
Andre Lorbach
baca59fdfb Merge branch 'beta' into devel 2008-05-19 14:34:46 +02:00
Andre Lorbach
e33dd2c457 Added donate button into beta branch 2008-05-19 14:34:20 +02:00
Andre Lorbach
1d31618de9 Fixed merge issues
Merge branch 'devel'

Conflicts:

	ChangeLog
2008-05-19 14:30:43 +02:00
Andre Lorbach
0473c8c6b4 Fixed merge conflicts
Merge branch 'beta' into devel

Conflicts:

	ChangeLog
	src/index.php
2008-05-19 14:29:44 +02:00
Andre Lorbach
6ee90d7e00 Changed install.php handling, so it is not necessary to remove the script anymore.
To avoid problems with automatic package updating, we changed the installer handling.
From now, the install.php will be allowed to run only in two cases, first if the
config.php file is missing, and second if the config.php file is empty.

Also removed the install file remove warning.
2008-05-19 14:25:32 +02:00
Andre Lorbach
7ef1da61eb 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
Andre Lorbach
37b83d4158 Fixed merge conflicts
Merge branch 'devel'

Conflicts:

	src/templates/index.html
2008-05-19 13:25:43 +02:00
Andre Lorbach
f7d5d7fe4e Added pager to the bottom of the index page as well (bugtracker id 76) 2008-05-19 13:22:46 +02:00
Andre Lorbach
3ed6e69ea8 Configured Columns which are not defined will be automatically hidden now 2008-05-19 13:10:38 +02:00
Andre Lorbach
8c2947e22c Added correct Paypal Button 2008-05-19 11:12:11 +02:00
Andre Lorbach
56b252757e Added new link to menu, added donate button (finally) 2008-05-06 18:14:38 +02:00
Andre Lorbach
48a5aaee7f Added new menu links for Event fields to search in our upcoming global repository.
Also fixed minor css issues with the menu.css
2008-05-06 16:23:07 +02:00
Andre Lorbach
7fbdf97c98 Fixed merge conflicts
Conflicts:

	ChangeLog
2008-05-05 17:16:06 +02:00
Andre Lorbach
b80874f426 Added changelog comment v2.1.4 2008-05-05 17:14:35 +02:00
Andre Lorbach
3c2e2ee27e Added filtering support for the new Eventlog fields 2008-05-05 17:07:08 +02:00
Andre Lorbach
6b3dccaf18 Simplified columns configuration definition in config.sample.php 2008-05-05 16:26:09 +02:00
Andre Lorbach
a63763d523 Adding field mapping definitions for Windows Eventlog. 2008-05-05 16:23:17 +02:00
Andre Lorbach
146bd75a09 Fixed merge conflicts
Conflicts:

	src/themes/dark/main.css
	src/themes/default/main.css
2008-05-05 14:52:12 +02:00
Andre Lorbach
823443debe Converted all files from the themes folder to UNIX format 2008-05-05 14:50:42 +02:00
Andre Lorbach
f1f4f9da20 Fixed merge conflicts
Conflicts:

	src/templates/details.html
	src/templates/include_footer.html
	src/templates/index.html
	src/templates/install.html
	src/templates/search.html
2008-05-05 14:49:44 +02:00
Andre Lorbach
08e98b9ea1 Converted all files from the templates folder to UNIX format 2008-05-05 14:46:50 +02:00
Andre Lorbach
368b032351 Fixed merge conflicts
Conflicts:

	src/lang/de/main.php
2008-05-05 14:45:41 +02:00
Andre Lorbach
c9405db9dd Converted all files from the lang folder to UNIX format 2008-05-05 14:44:40 +02:00
Andre Lorbach
570d962d0e Fixed merge conflicts
Conflicts:

	src/js/common.js
2008-05-05 14:44:00 +02:00
Andre Lorbach
ec97a18c67 Converted all files from the js folder to UNIX format 2008-05-05 14:43:10 +02:00
Andre Lorbach
1ef822b54a Fixed merge conflicts
Conflicts:

	src/include/config.sample.php
	src/include/constants_filters.php
	src/include/constants_logstream.php
	src/include/functions_common.php
	src/include/functions_config.php
	src/include/functions_filters.php
	src/include/functions_frontendhelpers.php
2008-05-05 14:41:52 +02:00
Andre Lorbach
e8940c7330 Converted all files from the include folder to UNIX format 2008-05-05 14:38:10 +02:00
Andre Lorbach
5741c21436 Fixed merge conflicts
Conflicts:

	src/css/defaults.css
	src/css/menu.css
2008-05-05 14:36:34 +02:00
Andre Lorbach
fbc290deca Converted all files from the css folder to UNIX format 2008-05-05 14:34:56 +02:00
Andre Lorbach
2a66bb4f12 Merge branch 'beta' 2008-05-05 14:33:52 +02:00
Andre Lorbach
6155055090 Converted all files from the classes folder to UNIX format 2008-05-05 14:32:52 +02:00
Andre Lorbach
f46d0edf62 Solved Merge conflicts with beta branch
Conflicts:

	src/details.php
	src/index.php
	src/install.php
	src/search.php
	src/userchange.php
2008-05-05 11:47:45 +02:00
Andre Lorbach
28baedd51e Removed ^M from main php files 2008-05-05 11:42:25 +02:00
Andre Lorbach
c8927f50ce Merge branch 'beta' 2008-05-05 11:28:04 +02:00
Andre Lorbach
f847756320 Removed ^M from contrib/*.sh files 2008-05-05 11:27:36 +02:00
Andre Lorbach
5732adef0f Appended changes into changelog, and made a few bugfixes to the new features v2.3.1 2008-05-02 17:33:21 +02:00
Andre Lorbach
761ee2f92c Added new configuration variable to set the default SourceID
If the default source id differs from the current used one, the sourceid
variable will be appened into the search form, as well as into all needed links
within phplogcon. This makes it easier to copy and send links around.
2008-05-02 17:10:28 +02:00
Andre Lorbach
4b9e8c2994 Implemented auto reload function into main list view
Auto reload can be enabled in the configuration, but by default it
is disabled. However you can set auto reload anytime in your session
within phplogcon. The refresh is done using a META REFRESH.
2008-05-02 15:37:57 +02:00
Andre Lorbach
239e243d9e Merge branch 'master' of ssh://al@git.adiscon.com/git/phplogcon 2008-05-02 14:33:03 +02:00
Andre Lorbach
eeb144cbe0 Added support for gzip compression, of course configurable.
Gzip compression will reduce bandwith usage, so the default
setting is on.
2008-05-02 14:29:04 +02:00
Andre Lorbach
1656117827 The page title is now created with Source, and other useful informations.
It is also possible to configure a custom title string with the configuration,
which will be prepended into each phpLogcon page.
2008-05-02 12:20:55 +02:00
Rainer Gerhards
147349e8da fixed some nits in ChangeLog 2008-04-30 18:12:13 +02:00
Andre Lorbach
4bbe8170e3 Incremented build and appended changelog v2.3.0 2008-04-30 18:01:43 +02:00