Nils Adermann b16f3834a3 Merge branch 'develop-olympus' into develop ...

By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.

Conflicts:
	phpBB/includes/acp/acp_styles.php

2012-05-31 15:46:23 +02:00

..

acp

Merge branch 'develop-olympus' into develop

2012-05-31 15:46:23 +02:00

auth

Merge PR #813 branch 'develop-olympus' into develop

2012-05-21 22:35:54 -04:00

cache

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

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

captcha

[ticket/10575] Adding public visibility to the methods.

2012-04-05 14:16:56 +01: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-05-31 15:28:08 +02: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

[ticket/10871] Delete the unwanted implode

2012-05-04 20:08:42 +01: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/10756] Fixing variable declarations in style and template classes

2012-04-19 04:25:25 +02:00

template

[ticket/10756] Fixing variable declarations in style and template classes

2012-04-19 04:25:25 +02:00

ucp

Merge branch 'develop-olympus' into develop

2012-04-08 22:04:33 +02:00

utf

[ticket/10847] fixing all misspelled "dependant" to "dependent"

2012-04-30 21:55:24 +02:00

.htaccess

…

bbcode.php

[ticket/10756] Renaming phpbb_style_template to phpbb_template

2012-04-19 04:25:25 +02: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 branch 'develop-olympus' into develop

2012-05-31 15:28:08 +02: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

[ticket/10912] Default last post subject to empty lacking last post info

2012-05-26 21:21:22 -04:00

functions_download.php

Merge branch 'develop-olympus' into develop

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

functions_install.php

Merge PR #808 branch 'develop-olympus' into develop

2012-05-21 22:17:10 -04: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/10756] Renaming phpbb_style_template to phpbb_template

2012-04-19 04:25:25 +02: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

Merge branch 'develop-olympus' into develop

2012-05-14 00:40:20 +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

Merge branch 'develop-olympus' into develop

2012-05-31 11:55:12 +02:00

functions_user.php

Merge branch 'develop-olympus' into develop

2012-05-14 00:40:20 +02:00

functions.php

Merge branch 'develop-olympus' into develop

2012-05-31 15:30:05 +02: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

Merge branch 'develop-olympus' into develop

2012-05-29 20:36:52 -04:00

startup.php

[ticket/10893] Update the usage of Composer

2012-05-13 13:05:20 -04:00

user.php

[ticket/10754] Changing $style to $phpbb_style

2012-04-03 00:41:56 +03:00