Joas Schilling 7278356936 Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query

Conflicts:
	phpBB/includes/mcp/mcp_reports.php

2015-05-28 12:56:26 +02:00

..

adm

Merge branch '3.1.x'

2015-03-15 16:59:58 +08:00

assets

…

bin

[ticket/13769] Move environment check lower in phpbbcli.php

2015-05-23 17:26:52 -04:00

cache

…

config

Merge pull request #3586 from s9e/ticket/13680

2015-05-20 00:38:49 +02:00

develop

Merge branch '3.1.x'

2015-05-06 01:14:08 +02:00

docs

Merge branch '3.1.x'

2015-05-28 12:42:56 +02:00

download

…

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

2015-05-28 12:56:26 +02:00

install

[ticket/13871] Fix call to undefined member function on non-object error.

2015-05-28 11:53:35 +02:00

language

Merge branch '3.1.x'

2015-05-04 10:57:17 +02:00

phpbb

Merge branch '3.1.x'

2015-05-28 12:52:36 +02:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-05-28 11:17:20 +02:00

.htaccess

…

app.php

…

common.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

composer.json

[ticket/13762] Moving language related functionality into a separate class

2015-05-02 13:37:12 +02:00

composer.lock

[ticket/11530] Updated s9e\TextFormatter

2015-05-18 06:49:53 +02:00

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

[ticket/11530] Remove extra quotes when depth limit is exceeded

2015-05-18 03:57:48 +02:00

report.php

[ticket/13654] Moving reporting into controller

2015-04-16 11:29:11 +02:00

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

Merge branch '3.1.x'

2015-05-08 11:16:45 +02:00

viewtopic.php

Merge branch '3.1.x'

2015-05-06 21:47:10 +02:00

web.config

[ticket/13271] Fix URL Rewriting on IIS7

2015-03-23 18:23:12 +01:00