David King 8b7aef6f93 Merge branch 'develop' into ticket/11215 ...

* develop: (176 commits)
  [feature/bootstrap-dic] Bootstrap container from config.php
  [ticket/11548] Use new static methods for request and submit
  [ticket/10772] Updating tests
  [ticket/10772] Remove 3.1 code
  [ticket/11388] Add newlines at EOF
  [ticket/11388] INCLUDECSS
  [ticket/11548] Run array_map on complete error array and not just colour_error
  [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
  [ticket/11388] Do not append assets_version if using remote path (e.g. http)
  [ticket/11388] Fix typo
  [ticket/11388] Remove typehints (causing tests to fail)
  [ticket/11388] Disable cache if IN_INSTALL defined
  [ticket/11388] Do not modify by reference
  [ticket/11388] typehits
  [ticket/11388] INCLUDEJS test for //(url)
  [ticket/11388] INCLUDEJS supports //(url)
  [ticket/11388] Fixing includejs test
  [ticket/11388] includejs inherit from includeasset
  [feature/twig] Unit tests for includejs
  [ticket/8319] Add migration file for update change
  ...

2013-07-11 20:43:41 -04:00

..

acp

Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympus

2013-07-11 10:09:53 -05:00

auth

[feature/auth-refactor] Move auth providers to separate directory

2013-07-04 17:14:19 -04:00

avatar

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02: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

[feature/twig] Remove style dependency for controller helper

2013-07-05 12:11:59 -05:00

cron

[ticket/11015] Change more docblocks to phpbb_db_driver.

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

db

[ticket/8319] Add migration file for update change

2013-07-10 17:25:27 +02: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

feed

[ticket/11481] Move prepended slash from calls into function

2013-06-06 20:35:38 +02: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

[feature/auth-refactor] Fix the actual cause of test failures

2013-07-01 22:40:49 -04:00

search

[ticket/11437] avoid $start becoming negative when no search results are found

2013-06-19 02:14:04 +05:30

style

[ticket/11388] Fix typo

2013-07-11 11:27:15 -05:00

template

[ticket/11388] INCLUDECSS

2013-07-11 15:31:55 -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-07-12 00:11:18 +02:00

utf

…

.htaccess

…

bbcode.php

[feature/twig] Fix BBCode parser

2013-07-02 11:29:32 -05: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 branch 'ticket/11566' into ticket/11566-develop

2013-07-01 23:25:29 +05:30

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/11010] resolving latest comments

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

functions_admin.php

Merge branch 'develop-olympus' into develop

2013-07-05 18:21:38 -05:00

functions_compatibility.php

[feature/avatars] Use deprecated for compatibility function

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

functions_compress.php

…

functions_container.php

[feature/bootstrap-dic] Bootstrap container from config.php

2013-07-11 18:04:40 -04:00

functions_content.php

…

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 'ticket/10820' into ticket/10820-develop

2013-06-14 00:32:23 +05:30

functions_install.php

Merge branch 'develop-olympus' into develop

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

functions_jabber.php

…

functions_messenger.php

[feature/twig] Should have been else

2013-07-01 21:32:10 -05:00

functions_module.php

[feature/twig] Spacing

2013-07-04 15:24:42 -05:00

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

[ticket/11103] Instantiate $phpbb_notifications as needed

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

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

[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

Merge branch 'develop-olympus' into develop

2013-06-11 18:46:30 +02:00

functions.php

[ticket/11215] Correct for different URL but same path info

2013-07-06 23:21:57 -04: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

[feature/auth-refactor] Refactor code to use services

2013-06-21 18:04:11 -04: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