Andreas Fischer 21bd0ca31a Merge branch 'develop-olympus' into develop ...

With 5efdbfa5e4 reverted.

* develop-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.

2012-03-22 10:51:03 +01:00

..

acp

Merge branch 'develop-olympus' into develop

2012-03-09 05:55:56 -05:00

auth

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

cache

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

captcha

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

config

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

cron

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

db

Merge branch 'develop-olympus' into develop

2012-03-08 08:44:32 -05:00

diff

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

extension

[ticket/10663] Extension finder should not find subdirs with directory filter

2012-02-21 18:32:08 +01:00

hooks

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

lock

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

mcp

Merge branch 'develop-olympus' into develop

2012-03-16 06:18:35 -04:00

questionnaire

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

request

[ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop

2012-02-04 00:57:39 +01:00

search

Merge branch 'develop-olympus' into develop

2012-03-08 08:44:32 -05:00

template

[feature/append_var] Adding append_var template class function

2012-03-05 02:41:42 +02:00

ucp

Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop

2012-02-03 16:21:51 -05:00

utf

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

.htaccess

[ticket/9698] Add .htaccess to the includes subdirectory.

2010-10-15 16:47:21 +02:00

auth.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

bbcode.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

class_loader.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

constants.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

error_collector.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_acp.php

Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop

2012-01-02 17:54:54 +01:00

functions_admin.php

Merge remote-tracking branch 'bantu/ticket/10636' into develop

2012-02-10 13:25:46 -05:00

functions_compress.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_content.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_convert.php

Merge branch 'develop-olympus' into develop

2012-01-02 19:54:46 +01:00

functions_display.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_download.php

Merge branch 'develop-olympus' into develop

2012-02-11 05:58:29 -05:00

functions_install.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_jabber.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_messenger.php

[ticket/10076] STARTTLS support for SMTP via smtp_class.

2012-01-28 22:51:35 +01:00

functions_module.php

[ticket/10634] Changing p_master::is_full_class

2012-02-09 01:34:37 +02:00

functions_posting.php

Merge branch 'develop-olympus' into develop

2012-03-02 14:22:32 +01:00

functions_privmsgs.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_profile_fields.php

Merge branch 'develop-olympus' into develop

2012-03-09 05:55:56 -05:00

functions_transfer.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_upload.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_user.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions.php

Merge branch 'develop-olympus' into develop

2012-02-11 05:48:03 -05:00

group_positions.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

index.htm

…

message_parser.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

session.php

Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop

2012-01-02 17:54:54 +01:00

startup.php

Merge branch 'develop-olympus' into develop

2012-03-22 10:51:03 +01:00