Joas Schilling e23d2e7b20 Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Prepare Changelog
  [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2014-09-20 09:55:56 +02:00

..

auth

[ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth

2014-08-12 23:12:57 +02:00

avatar

Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus

2014-08-11 17:37:56 +02:00

cache

Merge branch 'develop-ascraeus' into develop

2014-08-08 15:06:46 +02:00

captcha

[ticket/11854] Don't override get service name in nogd

2014-08-11 08:04:14 +02:00

config

…

console

[ticket/12963] Revert back to "migrations" folder name for extensions

2014-09-18 10:45:08 +02:00

controller

[ticket/13073] Add path regex to get_preg_expression() and add unit tests

2014-09-19 13:54:15 +02:00

cron

[ticket/12557] Fix php file description

2014-08-07 13:19:49 +03:00

db

Merge branch 'develop-ascraeus' into develop

2014-09-20 09:55:56 +02:00

di

[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

2014-09-13 14:34:18 +02:00

event

Merge branch 'develop-ascraeus' into develop

2014-09-17 20:11:23 +02:00

extension

[ticket/12963] Revert back to "migrations" folder name for extensions

2014-09-18 10:45:08 +02:00

feed

[ticket/12966] Sort by post_time and post_id where applicable

2014-08-23 16:36:39 +02:00

groupposition

…

hook

…

lock

…

log

[ticket/12912] Undefined index when adding logs from extensions

2014-08-03 13:28:14 -04:00

message

[ticket/12723] Add Sniff ensuring PHP files use the correct file header

2014-06-22 00:45:34 +02:00

mimetype

[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests

2014-09-05 21:55:49 +02:00

notification

[ticket/12990] Use the full services name for the notification's types

2014-08-16 21:46:03 +02:00

passwords

[ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy

2014-06-16 22:35:41 +02:00

php

…

plupload

[ticket/12560] Add methods to set upload and temp paths in plupload

2014-07-20 21:37:34 +02:00

profilefields

[ticket/12734] Remove unnecessary error supressing

2014-09-10 18:37:16 +02:00

request

…

search

Merge branch 'develop-ascraeus' into develop

2014-08-07 12:44:10 +02:00

template

Merge branch 'develop-ascraeus' into develop

2014-09-02 20:55:25 +02:00

tree

[ticket/12557] Fix doc block errors found by Sami pt1

2014-08-03 07:03:08 +03:00

class_loader.php

…

composer.json

[ticket/12920] Add missing comma

2014-08-07 15:44:36 +02:00

config_php_file.php

[ticket/12937] Do not return false. Return null for get and array() for all.

2014-08-08 15:29:34 +02:00

content_visibility.php

[ticket/12718] Fix docblocks

2014-08-07 23:46:12 +02:00

datetime.php

[ticket/12557] Fix doc block errors found by Sami pt1

2014-08-03 07:03:08 +03:00

error_collector.php

…

filesystem.php

…

finder.php

…

json_response.php

…

pagination.php

…

path_helper.php

[ticket/12852] Add space after if

2014-09-04 17:44:41 +02:00

permissions.php

[ticket/12782] Use an interface for the phpbb event_dispatcher

2014-06-28 13:19:55 +02:00

recursive_dot_prefix_filter_iterator.php

…

session.php

[ticket/13048] Only update session_page if request is not ajax

2014-09-07 10:15:51 +02:00

symfony_request.php

…

user_loader.php

…

user.php

[ticket/12932] Remove set_datetime_class method from user class

2014-08-10 14:06:19 +02:00

version_helper.php

…

viewonline_helper.php

[ticket/12834] Correctly match directories in session page

2014-07-08 17:53:32 +02:00