Marc Alexander 47b32f1da9 Merge branch '3.1.x' ...

Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php

2015-08-08 22:23:03 +02:00

..

auth

[ticket/13961] Move back service_collections under original namespace

2015-06-26 01:04:36 +02:00

avatar

Merge branch '3.1.x'

2015-08-08 22:23:03 +02:00

cache

Merge branch 'ticket/13930' into ticket/13930-master

2015-06-08 15:39:47 +02:00

captcha

[ticket/13961] Move back service_collections under original namespace

2015-06-26 01:04:36 +02:00

config

…

console

Merge remote-tracking branch 'Nicofuma/ticket/12692'

2015-08-07 10:07:45 +02:00

controller

Merge branch '3.1.x'

2015-05-17 20:02:29 +02:00

cron

Merge branch '3.1.x'

2015-06-22 00:45:42 +02:00

db

Merge pull request #3698 from s9e/ticket/13935

2015-08-05 12:59:55 +02:00

di

[ticket/13740] Fix itteration problems, implement class name aware collections

2015-07-09 19:08:28 +02:00

event

Merge branch '3.1.x'

2015-05-28 14:16:11 +02:00

exception

…

extension

…

feed

…

filesystem

[ticket/14033] Fix errors in docblocks

2015-07-16 22:52:25 -07:00

groupposition

…

help

[ticket/14033] Fix errors in docblocks

2015-07-16 22:52:25 -07:00

hook

…

install

[ticket/14056] Fix remaining schema path

2015-07-29 22:08:37 +02:00

language

[ticket/13740] Allow language change in the installer

2015-07-22 03:16:16 +02:00

lock

…

log

Merge branch 'ticket/13930' into ticket/13930-master

2015-06-08 15:39:47 +02:00

message

…

mimetype

…

module

[ticket/13777] Remove module_class_not_defined_exception

2015-05-31 16:27:16 +02:00

notification

[ticket/14079] Correctly mark notifications as read

2015-08-08 19:18:18 +02:00

passwords

[ticket/13961] Move back service_collections under original namespace

2015-06-26 01:04:36 +02:00

php

…

plupload

…

profilefields

[ticket/13961] Move back service_collections under original namespace

2015-06-26 01:04:36 +02:00

report

…

request

…

routing

[ticket/13388] Fix coding style

2015-05-30 13:14:27 +02:00

search

Merge pull request #3696 from marc1706/ticket/13930-master

2015-06-09 21:27:23 +02:00

template

Merge branch '3.1.x'

2015-07-08 22:54:26 +02:00

textformatter

[ticket/13935] Allow more admin-configurable schemes in post links

2015-07-15 22:05:06 +02:00

textreparser

[ticket/13987] Replaced optional parameter with explicit API

2015-07-06 23:45:38 +02:00

tree

[ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3

2015-06-13 13:20:55 +02:00

class_loader.php

…

composer.json

…

config_php_file.php

…

content_visibility.php

…

datetime.php

…

error_collector.php

…

file_downloader.php

…

filesystem.php

…

finder.php

…

json_response.php

…

pagination.php

…

path_helper.php

…

permissions.php

[ticket/8708] Add f_announce_global permission

2015-07-19 21:26:47 +02:00

recursive_dot_prefix_filter_iterator.php

…

session.php

Merge pull request #3514 from CHItA/ticket/13740

2015-07-27 11:24:43 +02:00

symfony_request.php

…

user_loader.php

Merge branch '3.1.x'

2015-06-16 12:35:51 +02:00

user.php

[ticket/14033] Fix errors in docblocks

2015-07-16 22:52:25 -07:00

version_helper.php

…

viewonline_helper.php

…