Nils Adermann 0ef95a7009 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com

Conflicts:
	phpBB/language/en/install.php
	phpBB/language/en/ucp.php

2013-07-13 13:16:58 -04:00

..

acp

Merge branch 'develop-olympus' into develop

2013-07-13 13:16:58 -04:00

auth

[ticket/11626] Remove last reference to template in ldap

2013-07-12 15:57:35 -04:00

avatar

[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0

2013-07-12 14:35:17 -04:00

cache

…

captcha

…

config

…

controller

[feature/twig] Remove style dependency for controller helper

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

cron

…

db

Merge branch 'develop-olympus' into develop

2013-07-13 13:16:58 -04:00

di

…

diff

…

event

…

extension

…

feed

[ticket/9657] Remove old code

2013-07-13 10:47:42 -04:00

groupposition

…

hook

…

hooks

…

lock

…

log

…

mcp

[ticket/9657] Keep approval state of posts/topics when copying them

2013-07-13 00:54:39 -04:00

notification

…

php

…

questionnaire

…

request

…

search

Merge remote-tracking branch 'phpbb/develop' into ticket/9657

2013-07-13 09:36:24 -04:00

style

[ticket/11388] Fix typo

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

template

Merge pull request #1519 from cyberalien/ticket/11647

2013-07-13 08:46:46 -07:00

tree

…

ucp

Merge remote-tracking branch 'phpbb/develop' into ticket/9657

2013-07-13 09:36:24 -04:00

utf

…

.htaccess

…

bbcode.php

…

class_loader.php

…

constants.php

[develop-olympus] Increment version number to 3.0.13-dev.

2013-07-12 21:10:05 +02:00

content_visibility.php

[ticket/9657] Add type hints for classes

2013-07-11 22:41:24 -04:00

datetime.php

…

error_collector.php

…

filesystem.php

…

functions_acp.php

…

functions_admin.php

Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

2013-07-11 11:41:48 +02:00

functions_compatibility.php

…

functions_compress.php

…

functions_container.php

[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)

2013-07-12 09:37:24 -05:00

functions_content.php

…

functions_convert.php

…

functions_database_helper.php

…

functions_display.php

[ticket/9657] Use the service instead of the static class

2013-07-11 14:24:07 +02:00

functions_download.php

…

functions_install.php

…

functions_jabber.php

Merge branch 'develop-olympus' into develop

2013-07-12 10:37:52 -05:00

functions_messenger.php

…

functions_module.php

[feature/twig] Spacing

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

functions_posting.php

[ticket/9657] Use the service instead of the static class

2013-07-11 14:24:07 +02:00

functions_privmsgs.php

…

functions_profile_fields.php

…

functions_transfer.php

…

functions_upload.php

…

functions_url_matcher.php

…

functions_user.php

…

functions.php

[ticket/9657] Remove sql_visibility as it is always non-empty

2013-07-11 22:35:55 -04:00

index.htm

…

json_response.php

…

message_parser.php

…

session.php

[feature/auth-refactor] Check that providers implement auth interface

2013-07-11 14:54:52 -04:00

sphinxapi.php

…

startup.php

…

user_loader.php

…

user.php

…