Oleg Pudeyev 7d6b289671 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php

2012-04-04 15:33:51 -04:00

..

acp

[ticket/10752] Fixes for acp_styles

2012-04-03 14:26:38 +03:00

auth

[feature/class-prefix] Rename auth => phpbb_auth

2012-03-31 18:14:11 +02: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

event

[feature/event-dispatcher] Fix copyright years

2012-03-30 14:22:20 +02:00

extension

[ticket/10735] Changing locator paths structure

2012-03-31 21:20:18 +03: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

[feature/class-prefix] Rename auth => phpbb_auth

2012-03-31 18:14:11 +02: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

style

[ticket/10665] Changing template->_js_include to public

2012-04-01 20:29:03 +03:00

ucp

[feature/class-prefix] Rename auth => phpbb_auth

2012-03-31 18:14:11 +02:00

utf

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

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

.htaccess

…

bbcode.php

[feature/merging-style-components] Moving template initialization out of style

2012-03-31 18:10:00 +03: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 branch 'develop-olympus' into develop

2012-04-04 15:33:51 -04: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/10438] Alligning the Smileys on the same line as the text.

2012-04-02 00:35:39 +05:30

functions_convert.php

Merge branch 'develop-olympus' into develop

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

functions_display.php

[feature/ajax] Add entirely unrelated but nice newlines

2012-03-31 02:10:18 +02: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

[feature/merging-style-components] Moving template initialization out of style

2012-03-31 18:10:00 +03:00

functions_module.php

Merge remote-tracking branch 'dhruvgoel92/ticket/10704' into develop

2012-03-22 10:59:41 +01:00

functions_posting.php

Merge branch 'develop-olympus' into develop

2012-03-31 19:29:56 +02:00

functions_privmsgs.php

[feature/class-prefix] Rename auth => phpbb_auth

2012-03-31 18:14:11 +02:00

functions_profile_fields.php

[feature/class-prefix] Rename user and session to phpbb_*

2012-03-31 18:14:07 +02: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

Merge branch 'develop-olympus' into develop

2012-03-22 18:15:10 +01:00

functions.php

Merge branch 'develop-olympus' into develop

2012-04-04 15:33:51 -04:00

group_positions.php

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

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

index.htm

…

json_response.php

[ticket/10328] Fixed the header of json_response.php.

2012-03-31 02:09:21 +02:00

message_parser.php

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

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

session.php

[feature/class-prefix] Rename user and session to phpbb_*

2012-03-31 18:14:07 +02:00

startup.php

[feature/event-dispatcher] Rename PHPBB_NO_AUTOLOAD=>PHPBB_NO_COMPOSER_AUTOLOAD

2012-03-28 21:48:46 +02:00

user.php

[feature/class-prefix] Rename user and session to phpbb_*

2012-03-31 18:14:07 +02:00