Nils Adermann 99f63f39eb Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id

Conflicts:
	phpBB/phpbb/session.php

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

..

adm

Merge pull request #2844 from marc1706/ticket/12858

2014-09-24 13:47:59 +02:00

assets

Merge pull request #2844 from marc1706/ticket/12858

2014-09-24 13:47:59 +02:00

bin

[ticket/12663] Have cli.php language file at top level; unrelated to ACP.

2014-07-17 16:54:42 +02:00

cache

…

config

[ticket/12987] Cleanup the services.yml file

2014-10-03 00:32:08 +02:00

develop

[ticket/13137] Improve output of create_schema_files.php

2014-10-07 17:17:59 +02:00

docs

[ticket/13187] Fix HTML validity of INSTALL.html

2014-10-20 15:36:27 +02:00

download

[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

2014-09-13 14:34:18 +02:00

ext

…

files

…

images

…

includes

Merge pull request #3030 from Senky/ticket/13164

2014-10-18 21:47:15 -04:00

install

[prep-release-3.1.0-RC5] Update phpBB Version for RC6 development

2014-10-07 22:10:45 +02:00

language

[ticket/13181] Replace database credentials with placeholders in sphinx conf

2014-10-18 12:32:39 -04:00

phpbb

Merge branch 'develop-olympus' into develop-ascraeus

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

store

…

styles

Merge remote-tracking branch 'PayBas/ticket/12796' into develop-ascraeus

2014-10-16 19:32:11 -07:00

.htaccess

…

app.php

…

common.php

[ticket/12775] Update doc blocks

2014-07-07 01:02:37 +02:00

composer.json

[ticket/13032] Also update symfony/css-selector and pin it down.

2014-09-03 21:47:41 +02:00

composer.lock

[ticket/13032] Also update symfony/css-selector and pin it down.

2014-09-03 21:47:41 +02:00

cron.php

[ticket/12898] Call garbage_collection() at the end of cron.php

2014-07-28 14:45:39 +02:00

faq.php

…

feed.php

[ticket/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

index.php

…

mcp.php

[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global

2014-06-23 22:58:41 +02:00

memberlist.php

[ticket/12796] Use & in path

2014-10-14 12:58:07 +02:00

posting.php

[ticket/13123] Add events to allow modifying post data

2014-10-01 00:13:37 +02:00

report.php

[ticket/12990] Use the full services name for the notification's types

2014-08-16 21:46:03 +02:00

search.php

Merge pull request #2978 from blitze/ticket/13071

2014-10-01 10:01:09 +02:00

ucp.php

[ticket/12612] Move function from ucp.php to functions_user.php

2014-06-18 16:57:13 +02:00

viewforum.php

[ticket/13062] Fix name of "ORDER_BY" key in SQL array

2014-09-19 00:56:16 +02:00

viewonline.php

[ticket/13051] Fix core event name

2014-09-09 13:12:29 -07:00

viewtopic.php

[ticket/13186] Don't show link on post count when search disabled

2014-10-20 13:25:07 +02:00

web.config

…