Dhruv 3931f7f3b9 Merge branch 'develop-olympus' into develop ...

# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv (1)
* develop-olympus:
  [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
  [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.

Conflicts:
	phpBB/includes/search/fulltext_mysql.php
	phpBB/language/en/acp/search.php

2013-06-05 01:55:49 +05:30

..

acp

Merge branch 'develop-olympus' into develop

2013-06-03 15:39:07 +02:00

auth

[ticket/11010] changing email and url input types in php files

2013-05-20 18:34:28 +02:00

avatar

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

cache

…

captcha

[ticket/9975] Moved a few E_USER_ERROR errors to /language

2013-04-23 09:55:36 -07:00

config

[ticket/10202] Rename method names _all() to _array().

2013-03-05 23:15:46 +01:00

controller

[ticket/11335] (controller/helper.php) Make php_ext 'php' not '.php'

2013-04-24 17:45:33 -05:00

cron

…

db

Merge remote-tracking branch 'EXreaction/ticket/11387' into develop

2013-05-31 17:21:00 +02:00

di

…

diff

…

event

…

extension

Merge remote-tracking branch 'EXreaction/ticket/11415' into develop

2013-05-18 11:20:47 -04:00

groupposition

…

hook

[ticket/11335] (hook finder) Make php_ext 'php' not '.php'

2013-04-24 17:45:39 -05:00

hooks

…

lock

[ticket/11495] Add owns_lock() method to lock classes

2013-04-30 15:48:29 +02:00

log

[ticket/10714] Logs are disabled for this page call only

2013-03-03 20:30:17 +01:00

mcp

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars

2013-03-04 00:22:15 +01:00

notification

Merge remote-tracking branch 'EXreaction/ticket/11413' into develop

2013-05-20 11:54:39 -04:00

php

…

questionnaire

…

request

…

search

Merge branch 'develop-olympus' into develop

2013-06-05 01:55:49 +05:30

style

[ticket/10844] Make sure ext_path has no trailing slash

2013-04-12 21:35:07 +02:00

template

[ticket/11435] Create new template filter option (cleanup)

2013-05-20 11:45:32 -05:00

tree

[ticket/11495] Throw exception when item that should be deleted does not exist

2013-04-30 22:19:35 +02:00

ucp

Merge branch 'develop-olympus' into develop

2013-05-26 19:19:08 +02:00

utf

…

.htaccess

…

bbcode.php

[ticket/10844] Add phpbb_root_path to phpbb_style_extension_path_provider

2013-04-12 21:35:06 +02:00

class_loader.php

[ticket/11335] (class loader) Make php_ext 'php' not '.php'

2013-04-24 17:45:30 -05:00

constants.php

Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into develop

2013-03-04 13:25:53 -06:00

datetime.php

…

error_collector.php

…

filesystem.php

[ticket/11362] Move phpbb_clean_path into a simple filesystem service

2013-04-17 17:46:58 +02:00

functions_acp.php

[ticket/11010] resolving latest comments

2013-05-21 11:55:45 +02:00

functions_admin.php

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

2013-05-20 11:55:33 -05:00

functions_compatibility.php

…

functions_compress.php

…

functions_container.php

[ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/

2013-03-03 20:30:54 +01:00

functions_content.php

…

functions_convert.php

…

functions_database_helper.php

…

functions_display.php

…

functions_download.php

Merge branch 'develop-olympus' into develop

2013-05-06 22:11:33 +02:00

functions_install.php

…

functions_jabber.php

…

functions_messenger.php

Merge pull request #1367 from EXreaction/ticket/11454

2013-04-25 03:59:34 -07:00

functions_module.php

…

functions_posting.php

[ticket/11586] Move $filedata['thumbnail'] to where it might be returned.

2013-06-03 16:24:12 +02:00

functions_privmsgs.php

…

functions_profile_fields.php

[ticket/11010] dealing with dimensions problem, removing extra code

2013-05-20 18:42:06 +02:00

functions_transfer.php

…

functions_upload.php

…

functions_url_matcher.php

[ticket/11335] (kernel request subscriber) Make php_ext 'php' not '.php'

2013-04-24 17:45:41 -05:00

functions_user.php

Merge branch 'develop-olympus' into develop

2013-05-27 23:07:06 +02:00

functions.php

Merge branch 'develop-olympus' into develop

2013-05-16 17:46:19 +02:00

index.htm

…

json_response.php

…

message_parser.php

…

session.php

[ticket/9975] Translate missing style error message

2013-04-21 17:38:49 +02:00

sphinxapi.php

…

startup.php

…

user_loader.php

[ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.

2013-03-15 01:22:00 +01:00

user.php

Merge branch 'develop-olympus' into develop

2013-04-24 19:13:47 +02:00