Máté Bartus a01e3a0ffa Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14132] Use transaction for adding notifications to type table [ticket/14519] Skip query if all unread notifications are retrieved [ticket/14483] Do not send headers by default on access via controller Conflicts: phpBB/phpbb/notification/manager.php		2016-03-08 22:18:42 +01:00
..
attachment	[ticket/14168] Correctly state return type of upload and upload_attachment	2015-10-12 12:11:26 +02:00
auth	[ticket/14250] Change token_storage class to fit changed interface	2016-01-04 03:38:28 +01:00
avatar	Merge branch '3.1.x'	2016-01-06 13:26:23 +01:00
cache	Merge branch '3.1.x' into 3.2.x	2016-02-18 22:00:10 +01:00
captcha	[ticket/13454] Remove unused variables	2016-01-06 13:52:11 +01:00
config	[ticket/14116] sql_affectedrows method has no arguments	2015-08-19 16:12:01 -07:00
console	[ticket/14434] Refactored to check migrations when setting them	2016-01-28 12:17:35 -08:00
controller	Merge branch '3.1.x' into 3.2.x	2016-03-08 22:18:42 +01:00
cron	[ticket/14402] Directly pass user id and ip	2016-01-15 11:22:13 +01:00
db	Merge branch '3.1.x' into 3.2.x	2016-03-07 09:52:30 +01:00
debug	[ticket/14177] CS	2015-12-15 19:55:55 +01:00
di	[ticket/14489] Fix bug where extension custom compiler pass cannot be found.	2016-02-18 23:56:53 -05:00
event	[ticket/14039] Revamp updater	2015-10-17 23:05:57 +02:00
exception	[ticket/13361] Rename exception to runtime_exception	2015-01-21 08:41:02 +01:00
extension	[ticket/14434] Refactored to check migrations when setting them	2016-01-28 12:17:35 -08:00
feed	Merge branch '3.1.x'	2015-08-28 17:34:50 +02:00
files	[ticket/14448] Correctly pass verify setting if available	2016-02-08 13:26:19 +01:00
filesystem	[ticket/14033] Fix errors in docblocks	2015-07-16 22:52:25 -07:00
group	[ticket/12143] Add group helper class to translate groupnames	2015-08-05 17:50:22 +02:00
groupposition
help	[ticket/14033] Fix errors in docblocks	2015-07-16 22:52:25 -07:00
hook	[ticket/14039] Revamp updater	2015-10-17 23:05:57 +02:00
install	[ticket/14510] Prevent infinite loop in add_bots task	2016-03-02 21:48:10 +01:00
language	[ticket/14432] Adds a method to get raw language values	2016-01-26 23:45:51 +01:00
lock
log	Merge branch '3.1.x'	2016-01-15 11:18:13 +01:00
message	Merge pull request #3108 from Elsensee/ticket/13284	2014-11-21 23:10:00 +01:00
mimetype
module	[ticket/13777] Remove module_class_not_defined_exception	2015-05-31 16:27:16 +02:00
notification	Merge branch '3.1.x' into 3.2.x	2016-03-08 22:18:42 +01:00
passwords	Merge branch '3.1.x'	2015-10-21 00:32:20 +02:00
php
plupload	Merge branch '3.1.x'	2015-10-14 08:38:32 +02:00
profilefields	Merge branch '3.1.x'	2015-08-20 15:48:18 +02:00
report	[ticket/13454] Remove unused variables	2016-01-06 13:51:19 +01:00
request	[ticket/13454] Remove unused variables	2016-01-06 13:52:11 +01:00
routing	[ticket/14039] Revamp updater	2015-10-17 23:05:57 +02:00
search	[ticket/13454] Remove more unused variables	2016-01-06 13:52:11 +01:00
template	[ticket/14457] Handle the case where there isn't any 'definition' bag	2016-02-18 17:30:31 +01:00
textformatter	Merge pull request #4059 from JoshyPHP/ticket/14323	2016-01-13 12:55:31 +01:00
textreparser	Merge pull request #4005 from Elsensee/ticket/14257	2015-12-05 11:21:40 +01:00
tree	[ticket/13454] Remove unused variables	2016-01-06 13:52:11 +01:00
class_loader.php
composer.json	[ticket/14382] Specify the branch-alias in the composer.json files	2016-01-09 15:42:42 +01:00
config_php_file.php
content_visibility.php	Merge pull request #3402 from brunoais/ticket/13621	2015-04-06 11:13:33 +02:00
datetime.php
error_collector.php	[ticket/13306] move error_reporting call	2014-11-13 20:55:10 -06:00
file_downloader.php	[ticket/12618] Change ssl:// to tls://	2016-01-10 19:33:45 +01:00
filesystem.php	[ticket/13697] Moving filesystem related functions to filesystem service	2015-04-16 13:24:10 +02:00
finder.php	[ticket/13697] Moving filesystem related functions to filesystem service	2015-04-16 13:24:10 +02:00
json_response.php
pagination.php	[ticket/13059] Add core event to generate_page_link()	2014-10-01 20:55:07 +08:00
path_helper.php	[ticket/14440] Add comments	2016-02-11 22:18:09 +01:00
permissions.php	Merge branch '3.1.x'	2015-10-11 10:48:53 +02:00
recursive_dot_prefix_filter_iterator.php
session.php	Merge branch '3.1.x' into 3.2.x	2016-02-13 18:08:01 +01:00
symfony_request.php	[ticket/13280] Output escaping for the symfony request object	2014-11-16 16:45:19 +01:00
user.php	[ticket/13454] Fix a few issues introduced by overdeleting stuff	2016-01-06 13:52:11 +01:00
user_loader.php	[ticket/14334] Use phpbb_get_avatar() in user_loader	2015-12-03 16:43:00 +01:00
version_helper.php	[ticket/12618] Allow extension author to use SSL for version-check	2015-09-25 22:16:29 +02:00
viewonline_helper.php	[ticket/13697] Moving filesystem related functions to filesystem service	2015-04-16 13:24:10 +02:00