Andreas Fischer 9480a5e512 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value

Conflicts:
	phpBB/includes/acp/acp_profile.php

2012-07-23 15:50:54 +02:00

..

acp

Merge branch 'develop-olympus' into develop

2012-07-23 15:50:54 +02:00

auth

…

cache

…

captcha

…

config

…

cron

…

db

Merge branch 'develop-olympus' into develop

2012-07-17 20:56:48 +02:00

diff

…

event

…

extension

[ticket/11012] Normalize $phpEx member vars to $php_ext

2012-07-21 16:19:01 +02:00

hooks

…

lock

…

mcp

[ticket/10990] Changes for develop

2012-07-22 14:48:39 -05:00

php

…

questionnaire

…

request

…

search

[ticket/10990] Changes for develop

2012-07-22 14:48:39 -05:00

style

[ticket/11012] Normalize $phpEx member vars to $php_ext

2012-07-21 16:19:01 +02:00

template

[ticket/11012] Normalize $phpEx member vars to $php_ext

2012-07-21 16:19:01 +02:00

ucp

[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate

2012-07-22 14:32:03 -05:00

utf

…

.htaccess

…

bbcode.php

…

class_loader.php

…

constants.php

…

datetime.php

[feature/new-tz-handling] Rename $user->tz back to $user->timezone

2012-07-18 16:52:52 +02:00

error_collector.php

…

functions_acp.php

…

functions_admin.php

[ticket/10990] Do not use comma separator when storing it as a log.

2012-07-22 14:39:10 -05:00

functions_compress.php

…

functions_content.php

…

functions_convert.php

…

functions_display.php

[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate

2012-07-22 14:32:03 -05:00

functions_download.php

…

functions_install.php

[ticket/10969] Also remove COMMENTS key from data array in get_available_dbms()

2012-07-08 21:42:30 +02:00

functions_jabber.php

…

functions_messenger.php

…

functions_module.php

…

functions_posting.php

[ticket/10968] Render pagination within the template

2012-07-18 14:30:20 +01:00

functions_privmsgs.php

Merge pull request #914 from EXreaction/ticket/10990

2012-07-22 16:25:17 -07:00

functions_profile_fields.php

Merge branch 'develop-olympus' into develop

2012-07-23 15:50:54 +02:00

functions_transfer.php

…

functions_upload.php

[ticket/10944] strpos now stricter and removed superfluous ternary

2012-07-17 17:39:19 +01:00

functions_user.php

[ticket/10990] Do not use comma separator when storing it as a log.

2012-07-22 14:39:10 -05:00

functions.php

Merge pull request #843 from nickvergessen/feature/new-tz-handling

2012-07-19 08:46:25 -07:00

group_positions.php

…

index.htm

…

json_response.php

…

message_parser.php

…

session.php

…

startup.php

…

update_helpers.php

[ticket/11002] Use translating option to rename the Etc/GMT options

2012-07-21 15:18:16 +02:00

user.php

[feature/new-tz-handling] Fall back to UTC, if the timezone is invalid

2012-07-19 15:46:12 +02:00