Andreas Fischer 3fefa5bb13 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.

Conflicts:
	phpBB/posting.php

2012-12-20 14:28:01 +01:00

..

acp

[ticket/11088] Move style, extension and language pack management to customise

2012-12-12 11:39:14 -05:00

auth

[ticket/10780] Use L_COLON on LDAP page.

2012-11-10 00:38:25 +01:00

cache

[ticket/10103] $rv had too few characters.

2012-12-04 13:45:02 -05:00

captcha

[ticket/11183] Remove $load_extensions and weird dl() calls

2012-11-10 11:25:22 +01:00

config

[ticket/11015] Change more docblocks to phpbb_db_driver.

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

controller

[feature/controller] Allow injecting Symfony Request into controllers

2012-11-17 18:05:32 -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 'upstream/develop' into ticket/11015

2012-12-13 07:56:40 -05:00

di

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

2012-12-13 07:56:40 -05:00

diff

…

event

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

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

extension

[ticket/11015] Change more docblocks.

2012-12-04 04:29:31 -05:00

hooks

…

lock

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

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

mcp

Merge PR #1140 branch 'develop-olympus' into develop

2012-12-16 16:48:15 -05: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/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.

2012-12-15 23:54:49 +01:00

style

Merge remote-tracking branch 'p/feature/template-events' into develop

2012-12-10 14:27:18 -05:00

template

Merge remote-tracking branch 'p/feature/template-events' into develop

2012-12-10 14:09:10 -05:00

ucp

[ticket/10679] Use module_auth to limit access to the module

2012-12-06 16:33:12 +01:00

utf

…

.htaccess

…

bbcode.php

[feature/template-events] Inject extension manager into template class.

2012-11-17 16:39:54 -05:00

class_loader.php

…

constants.php

…

datetime.php

…

error_collector.php

…

functions_acp.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00

functions_admin.php

Merge branch 'develop-olympus' into develop

2012-11-29 23:17:58 +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

Merge PR #1088 branch 'igorw/ticket/11199' into develop

2012-11-15 09:07:41 -05: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

[ticket/10954] Change behavior of marking topics/forums

2012-12-14 15:46:45 +01:00

functions_download.php

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

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

functions_install.php

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

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

functions_jabber.php

[ticket/11100] Mark can_use_ssl() and can_use_tls() as static.

2012-09-08 01:12:34 +02:00

functions_messenger.php

[ticket/11263] Fix PHP Notice: Undefined variable: extension_manager

2012-12-13 13:10:26 -06: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-olympus' into develop

2012-12-20 14:28:01 +01:00

functions_privmsgs.php

Merge remote-tracking branch 'upstream/develop' into feature/prune-users

2012-11-06 11:11:27 -05: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

[feature/controller] Rename get_paths to import_paths_from_finder

2012-11-16 17:05:46 -05:00

functions_user.php

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

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

functions.php

[ticket/11015] Move comment in the right place.

2012-12-13 19:21:23 -05:00

group_positions.php

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05: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/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00

sphinxapi.php

…

startup.php

…

update_helpers.php

…

user.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00