phpbb/phpBB/phpbb
Marc Alexander 2653b98e09 Merge branch 'ticket/14577' into ticket/14577-3.2.x
Conflicts:
	phpBB/includes/acp/acp_modules.php
2016-04-02 09:51:37 +02:00
..
attachment [ticket/14168] Correctly state return type of upload and upload_attachment 2015-10-12 12:11:26 +02:00
auth Merge branch '3.1.x' into 3.2.x 2016-03-27 12:56:03 +02:00
avatar Merge branch '3.1.x' into 3.2.x 2016-03-24 11:49:31 +01:00
cache [ticket/14555] Uniformize cache directory usages 2016-03-24 09:15:34 +01:00
captcha Merge branch '3.1.x' into 3.2.x 2016-03-25 11:43:05 +01:00
config [ticket/14116] sql_affectedrows method has no arguments 2015-08-19 16:12:01 -07:00
console [ticket/12684] Use a switch statement for readability 2016-03-21 13:54:50 -07:00
controller Merge branch '3.1.x' into 3.2.x 2016-03-08 22:18:42 +01:00
cron [ticket/14555] Uniformize cache directory usages 2016-03-24 09:15:34 +01:00
db Merge branch '3.1.x' into 3.2.x 2016-03-31 12:30:14 +02:00
debug [ticket/14177] CS 2015-12-15 19:55:55 +01:00
di [ticket/14555] Uniformize cache directory usages 2016-03-24 09:15:34 +01:00
event [ticket/14039] Revamp updater 2015-10-17 23:05:57 +02:00
exception
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 Merge pull request #4255 from CHItA/ticket/14393 2016-03-31 22:49:54 +02: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
mimetype
module Merge branch 'ticket/14577' into ticket/14577-3.2.x 2016-04-02 09:51:37 +02:00
notification [ticket/14572] Fix quote notification deletion 2016-03-30 12:53:44 -04: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 remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x 2016-03-27 09:59:25 +02:00
report [ticket/13454] Remove unused variables 2016-01-06 13:51:19 +01:00
request Merge branch '3.1.x' into 3.2.x 2016-03-27 12:56:03 +02:00
routing [ticket/14555] Uniformize cache directory usages 2016-03-24 09:15:34 +01:00
search Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x 2016-03-27 09:59:25 +02: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 [ticket/14381] Set the mode in message parser to "reparse" 2016-03-24 19:49:23 +01:00
tree [ticket/13454] Remove unused variables 2016-01-06 13:52:11 +01:00
class_loader.php
composer.json [ticket/14495] Updates the version to 3.3.0-a1-dev 2016-02-24 22:25:41 +01:00
config_php_file.php
content_visibility.php
datetime.php
error_collector.php
file_downloader.php [ticket/12618] Change ssl:// to tls:// 2016-01-10 19:33:45 +01:00
filesystem.php
finder.php
json_response.php
pagination.php
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 [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance 2016-03-17 00:50:08 +07:00
session.php Merge branch '3.1.x' into 3.2.x 2016-02-13 18:08:01 +01:00
symfony_request.php
user.php Merge branch '3.1.x' into 3.2.x 2016-03-24 17:53:57 +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