Andreas Fischer 124ff6c50a Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10531] Disallow deleting of the last style

Conflicts:
	phpBB/includes/acp/acp_styles.php

2011-12-16 16:19:22 +01:00

..

acp

Merge branch 'develop-olympus' into develop

2011-12-16 16:19:22 +01:00

auth

Merge branch 'develop-olympus' into develop

2011-10-14 03:56:55 +02:00

cache

Merge branch 'develop-olympus' into develop

2011-06-11 12:06:29 +02:00

captcha

[feature/extension-manager] Rename default methods to core methods on finder.

2011-11-18 16:44:42 +01:00

config

…

cron

[feature/extension-manager] Rename default methods to core methods on finder.

2011-11-18 16:44:42 +01:00

db

Merge branch 'develop-olympus' into develop

2011-11-18 19:17:46 +01:00

diff

…

extension

[ticket/10323] slight potential performance improvement

2011-11-20 02:08:37 +01:00

hooks

…

lock

…

mcp

[ticket/10345] Make use of the plural function in some basic places

2011-11-25 15:10:44 -05:00

questionnaire

[feature/request-class] Adjust code base to do html decoding manually

2011-08-18 23:44:30 +02:00

request

[feature/request-class] Remove $html_encode arg, force manual decoding

2011-08-18 23:19:48 +02:00

search

[feature/extension-manager] Add docblocks to new search backend methods

2011-11-18 14:46:30 +01:00

template

[feature/extension-manager] Clear up docs of extension related template changes

2011-11-18 15:29:32 +01:00

ucp

[ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions

2011-11-30 21:03:29 +01:00

utf

[ticket/9608] Revert changes to normalizer

2011-08-08 08:58:52 +02:00

.htaccess

…

auth.php

Merge branch 'develop-olympus' into develop

2011-07-16 22:11:32 -04:00

bbcode.php

[feature/extension-manager] Refactoring the structure of extension provider

2011-09-29 16:15:53 +02:00

class_loader.php

[feature/extension-manager] Document what the class loader stores in cache

2011-11-18 16:00:22 +01:00

constants.php

[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.

2011-12-04 00:22:10 +01:00

error_collector.php

[ticket/10369] Rename filter_errfile() to filter_root_path().

2011-09-18 22:32:25 +02:00

functions_acp.php

Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop

2011-10-20 20:46:48 -04:00

functions_admin.php

Merge branch 'develop-olympus' into develop

2011-12-03 22:25:32 -05:00

functions_compress.php

…

functions_content.php

[ticket/10345] Make use of the plural function in some basic places

2011-11-25 15:10:44 -05:00

functions_convert.php

…

functions_display.php

[ticket/10345] Make use of the plural function in some basic places

2011-11-25 15:10:44 -05:00

functions_download.php

[feature/request-class] Adjust code base to do html decoding manually

2011-08-18 23:44:30 +02:00

functions_install.php

Merge branch 'develop-olympus' into develop

2011-12-03 22:25:32 -05:00

functions_jabber.php

…

functions_messenger.php

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

functions_module.php

[feature/extension-manager] Rename default methods to core methods on finder.

2011-11-18 16:44:42 +01:00

functions_posting.php

Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop

2011-11-24 21:51:10 -05:00

functions_privmsgs.php

[ticket/10345] Make use of the plural function in some basic places

2011-11-25 15:10:44 -05:00

functions_profile_fields.php

[ticket/10345] Use the plural function in some more places.

2011-11-25 15:10:49 -05:00

functions_transfer.php

Merge branch 'develop-olympus' into develop

2011-08-14 15:52:11 -04:00

functions_upload.php

[ticket/10345] Use the plural function in some more places.

2011-11-25 15:10:49 -05:00

functions_user.php

[ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions

2011-11-30 21:03:29 +01:00

functions.php

Merge branch 'develop-olympus' into develop

2011-12-09 01:32:29 +01:00

group_positions.php

…

index.htm

…

message_parser.php

[ticket/10345] Use the plural function in some more places.

2011-11-25 15:10:49 -05:00

session.php

[ticket/10345] Check directly whether the key to use exists

2011-11-30 21:36:56 +01:00

startup.php

[ticket/10420] Update includes/startup.php for PHP 5.4.

2011-10-18 21:16:42 +02:00