Nathan Guse 421452e6fb Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop ...

# By David King
# Via David King (1) and Nathan Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/11551] Fix error in system tab if get_remote_file returns empty string

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

..

acp

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

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

auth

[ticket/10758] Extract obtain_user_data for the benefit of tests.

2012-12-19 21:50:35 -05:00

avatar

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

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

cache

[ticket/11305] Extract hook finder from cache service.

2013-01-02 01:29:32 -05:00

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

[ticket/11015] Change more docblocks to phpbb_db_driver.

2012-12-13 18:00:12 -05:00

db

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

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

di

Merge PR #1130 branch 'EXreaction/ticket/11259' into develop

2012-12-29 13:45:40 -05:00

diff

…

event

[feature/controller] Fix comments, check against more general HttpException

2012-11-19 12:55:15 -05:00

extension

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

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

groupposition

[ticket/10411] Throw exceptions instead of using trigger_error()

2013-02-26 16:52:53 +01:00

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

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

request

Merge remote-tracking branch 'Fyorl/ticket/10939' into develop

2012-11-10 23:49:29 +01:00

search

[ticket/11288] fix regex in postgres

2013-05-04 20:11:12 +05:30

style

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

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

template

Merge remote-tracking branch 'remotes/cyberalien/ticket/11482' into develop

2013-05-20 10:47:45 -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

[ticket/11535] Correctly merge avatar_errors array into primary error array

2013-05-13 12:17:31 +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

Merge branch 'develop-olympus' into develop

2013-02-24 17:58:27 +01:00

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/10896] Add missing email validation lost in develop merge

2013-02-24 17:42:53 +01: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

[feature/avatars] Use deprecated for compatibility function

2013-02-03 23:06:30 +01:00

functions_compress.php

[ticket/11159] Static public is the currently approved order.

2012-11-06 16:43:48 -05:00

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

Merge PR #786 branch 'brunoais/ticket/10845' into develop

2012-11-06 16:23:33 -05:00

functions_convert.php

…

functions_database_helper.php

[ticket/11162] Chase dbal autoloading changes in develop.

2012-12-13 21:27:30 -05:00

functions_display.php

[feature/avatars] Pass phpbb_user object to get_custom_html()

2013-01-08 15:34:20 +01:00

functions_download.php

Merge branch 'develop-olympus' into develop

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

functions_install.php

Merge branch 'develop-olympus' into develop

2012-12-31 00:54:31 +01:00

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

[ticket/10601] Comment to help understanding the code

2012-11-28 19:37:16 +00:00

functions_posting.php

Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103

2013-01-15 11:31:39 -06:00

functions_privmsgs.php

[ticket/11103] Instantiate $phpbb_notifications as needed

2012-12-13 19:19:40 -06:00

functions_profile_fields.php

…

functions_transfer.php

…

functions_upload.php

[ticket/10763] Use self when calling get_extension() in filespec class

2012-12-17 19:17:32 +01:00

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

[ticket/11454] Use set_addresses in other applicable areas

2013-04-24 15:34:12 -05: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

[ticket/11250] Move quote special cases from class to unit tests

2012-12-14 12:58:57 +01:00

session.php

[ticket/9975] Translate missing style error message

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

sphinxapi.php

[ticket/11248] Convert line endings to LF - develop edition.

2012-12-07 21:57:33 -05:00

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