Nils Adermann 837ed8b6e1 Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html

2014-08-11 17:38:29 +02:00

..

auth

[ticket/11854] Fix the factory in \phpbb\auth\provider\db

2014-08-11 01:16:42 +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

[ticket/12711] Cast values to string such that they are quoted in SQL queries.

2014-06-15 00:21:11 +02:00

console

Merge pull request #2793 from n-aleha/ticket/12909

2014-08-03 17:52:24 +02:00

controller

[ticket/security-155] Fix spelling error in comment

2014-08-09 01:45:26 +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-08-11 12:23:21 +02:00

di

[ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG

2014-07-15 22:58:28 +02:00

event

[ticket/12958] Remove more references of subsilver2

2014-08-10 12:17:03 +02:00

extension

[ticket/12903] Remove dead phpbb\extension\metadata_manager::_validate_version

2014-08-07 17:52:59 +02:00

feed

[ticket/12557] Fix php file description

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

groupposition

[ticket/12715] Cleanup comments in \phpbb\groupposition\*

2014-06-15 19:14:44 +02:00

hook

…

lock

[ticket/12715] Cleanup comments in \phpbb\lock\*

2014-06-15 19:14:47 +02:00

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/12949] Check if mime_content_type is actually callable

2014-08-09 17:21:19 +02:00

notification

[ticket/12742] Add sorting back to bookmark notification list of users

2014-08-09 17:48:59 +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/12794] Properly validate google+ field against valid character set

2014-08-08 17:06:01 +02:00

request

…

search

Merge branch 'develop-ascraeus' into develop

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

template

[ticket/12957] Removed unused use

2014-08-10 04:01:47 +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

[ticket/12508] Fix doc block

2014-06-10 11:47:43 +02:00

json_response.php

…

pagination.php

[ticket/12715] Cleanup comments in \phpbb\pagination

2014-06-15 19:15:16 +02:00

path_helper.php

[ticket/12557] Fix php file description

2014-08-07 13:19:49 +03: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/11854] Rename captchas.factory service to captcha.factory

2014-08-11 01:16:22 +02:00

symfony_request.php

[ticket/12715] Cleanup comments in \phpbb\symfony_request

2014-06-15 19:15:23 +02:00

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