Joas Schilling 8f027b68d6 Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling ...

Conflicts:
	phpBB/includes/functions_profile_fields.php
	phpBB/includes/session.php
	phpBB/install/database_update.php

2012-06-04 18:09:35 +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

…

captcha

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

2012-04-05 14:16:56 +01:00

config

…

cron

…

db

Merge branch 'develop-olympus' into develop

2012-05-31 15:28:08 +02:00

diff

…

event

…

extension

[ticket/10735] Changing locator paths structure

2012-03-31 21:20:18 +03:00

hooks

…

lock

…

mcp

[ticket/10871] Delete the unwanted implode

2012-05-04 20:08:42 +01:00

questionnaire

…

request

…

search

…

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

…

constants.php

…

datetime.php

…

error_collector.php

…

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

…

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

…

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

…

functions_install.php

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

2012-05-21 22:17:10 -04:00

functions_jabber.php

…

functions_messenger.php

[ticket/10756] Renaming phpbb_style_template to phpbb_template

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

functions_module.php

…

functions_posting.php

Merge branch 'develop-olympus' into develop

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

functions_privmsgs.php

Merge remote-tracking branch 'github-bantu/ticket/10790' into develop

2012-05-31 15:50:32 +02:00

functions_profile_fields.php

Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling

2012-06-04 18:09:35 +02:00

functions_transfer.php

…

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 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling

2012-06-04 18:09:35 +02:00

group_positions.php

…

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

…

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

Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling

2012-06-04 18:09:35 +02:00