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

…

cache

…

captcha

…

config

…

controller

[feature/twig] Remove style dependency for controller helper

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

cron

…

db

[ticket/8319] Add migration file for update change

2013-07-10 17:25:27 +02:00

di

…

diff

…

event

…

extension

…

feed

…

groupposition

…

hook

…

hooks

…

lock

…

log

…

mcp

…

notification

…

php

…

questionnaire

…

request

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

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

search

…

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

…

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

…

constants.php

Merge branch 'ticket/11566' into ticket/11566-develop

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

datetime.php

…

error_collector.php

…

filesystem.php

…

functions_acp.php

…

functions_admin.php

Merge branch 'develop-olympus' into develop

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

functions_compatibility.php

…

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

…

functions_display.php

…

functions_download.php

…

functions_install.php

…

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

…

functions_privmsgs.php

…

functions_profile_fields.php

…

functions_transfer.php

…

functions_upload.php

…

functions_url_matcher.php

…

functions_user.php

…

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

…

session.php

…

sphinxapi.php

…

startup.php

…

user_loader.php

…

user.php

…