Nathaniel Guse 87e4e05220 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig ...

# By Dhruv
# Via Andreas Fischer (3) and Dhruv (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [ticket/10838] Updated RUNNING_TESTS.md

2013-07-01 20:38:29 -05:00

..

acp

[ticket/11585] Make $auth_admin class property

2013-07-02 00:10:30 +05:30

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

[ticket/11503] similar implementation for mssql_native and odbc

2013-06-20 19:16:21 +05:30

di

…

diff

…

event

…

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

…

request

…

search

Merge branch 'develop-olympus' into develop

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

style

[feature/twig] Working on fixing tests

2013-06-24 15:28:54 -05:00

template

[feature/twig] Fix length replace in lexer

2013-07-01 14:58:20 -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/11602] Do not call localize_errors() if avatars are disabled

2013-06-11 14:54:22 +02:00

utf

…

.htaccess

…

bbcode.php

[feature/twig] Remove resource locator dependency from template

2013-07-01 13:28:08 -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 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/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 'ticket/10820' into ticket/10820-develop

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

functions_install.php

…

functions_jabber.php

…

functions_messenger.php

[feature/twig] Remove resource locator dependency from template

2013-07-01 13:28:08 -05: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-06-11 18:46:30 +02:00

functions.php

[ticket/9341] remove PREV_PAGE tpl var used for backward compatability

2013-06-27 20:47:03 +05:30

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