Joas Schilling 75b6545bc2 Merge pull request #3040 from nickvergessen/ticket/13138-asc ...

[3.1] Ticket/13138 Only use cookie data when we do not force a user_id

Conflicts:
	phpBB/phpbb/session.php

2014-10-20 22:19:25 +02:00

..

auth

[ticket/13085] Fix typo in oauth.php

2014-09-21 00:33:07 +03:00

avatar

…

cache

[ticket/11224] Revert Revert "Merge pull request #2460 from ticket/11224"

2014-10-03 23:50:24 +02:00

captcha

…

config

…

console

[ticket/12368] Always clean the cache prior to run the migrations

2014-10-05 12:25:14 +02:00

controller

[ticket/13113] Updates the base url only when the front-end isn't app.php

2014-09-28 23:32:56 +02:00

cron

…

db

[prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5

2014-10-07 21:12:06 +02:00

di

[ticket/13106] Remove \phpbb\di\pass\kernel_pass.php

2014-09-25 20:12:33 +02:00

event

[ticket/13124] Also trim spaces in front of comments except for first line

2014-10-06 16:09:56 +02:00

extension

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

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

feed

…

groupposition

…

hook

…

lock

…

log

…

message

…

mimetype

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

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

notification

…

passwords

…

php

…

plupload

…

profilefields

[ticket/13111] Dropdown options are already an array in the field data

2014-09-30 12:27:14 +02:00

request

…

search

Merge pull request #3048 from naderman/ticket/13188

2014-10-20 15:30:08 -04:00

template

[ticket/13070] Use old 'template' class for template class hook

2014-09-22 20:03:55 +02:00

tree

…

class_loader.php

…

composer.json

…

config_php_file.php

…

content_visibility.php

…

datetime.php

[ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"

2014-09-25 18:09:32 +02:00

error_collector.php

…

filesystem.php

…

finder.php

…

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/12852] Add space after if

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

permissions.php

…

recursive_dot_prefix_filter_iterator.php

…

session.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-10-20 14:53:38 -04:00

symfony_request.php

…

user_loader.php

…

user.php

[ticket/13118] Correctly use the provided datetime class

2014-09-30 11:58:02 +02:00

version_helper.php

…

viewonline_helper.php

…