Andreas Fischer 37b28ca7e7 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.

Conflicts:
	build/build.xml
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg

2013-07-12 21:34:15 +02:00

..

acp

Merge branch 'develop-olympus' into develop

2013-07-12 20:09:22 +02: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

…

captcha

[ticket/9975] Moved a few E_USER_ERROR errors to /language

2013-04-23 09:55:36 -07:00

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-12 21:34:15 +02:00

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

…

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

…

mcp

…

notification

Merge remote-tracking branch 'EXreaction/ticket/11413' into develop

2013-05-20 11:54:39 -04:00

php

…

questionnaire

…

request

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

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

search

[ticket/11662] Typos: occured -> occurred

2013-07-12 17:51:29 +02:00

style

[ticket/11388] Fix typo

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

template

[ticket/11665] Can't change file names already sent to set_filenames

2013-07-12 11:47:34 -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

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

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

datetime.php

…

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

…

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

…

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

Merge branch 'develop-olympus' into develop

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

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

…

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

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

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