Marc Alexander 45ba2e9770 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php

2016-07-07 19:19:40 +02:00

..

acp

Merge branch '3.1.x' into 3.2.x

2016-07-07 19:19:40 +02:00

email

Merge branch '3.1.x' into 3.2.x

2016-06-19 22:07:42 +02:00

help

[prep-release-3.2.0-b1] Update language help files

2016-02-03 22:33:03 +01:00

app.php

[ticket/14303] Use UTF8 quotes in app.php lang file

2015-12-26 08:14:33 +01:00

captcha_qa.php

[ticket/14241] Prevent empty q&a as a result of improper settings

2016-03-11 10:51:07 +01:00

captcha_recaptcha.php

[ticket/13789] Upgrade reCaptcha plugin to 2.0 API.

2015-10-14 19:05:27 -07:00

cli.php

[ticket/14561] Add a progress bar to reclean command

2016-03-31 15:07:59 -07:00

common.php

Merge branch '3.1.x' into 3.2.x

2016-03-27 12:34:49 +02:00

groups.php

…

index.htm

…

install.php

Merge pull request #4342 from Senky/ticket/14654

2016-07-07 19:15:33 +02:00

iso.txt

…

mcp.php

[ticket/9485] Add a "View post" link in the moderation logs

2015-08-30 19:52:00 +02:00

memberlist.php

[ticket/14283] Add a Manage Group link on a group page

2015-11-14 06:10:41 -05:00

migrator.php

[ticket/14162] Add CLI command db:revert

2015-09-20 12:26:46 +02:00

plupload.php

…

posting.php

[ticket/13904] Add language entries for error messages in upload class

2015-09-09 10:43:12 +02:00

search_ignore_words.php

…

search_synonyms.php

…

search.php

[ticket/13400] Information text if the server load id high at search

2014-12-06 13:42:16 +01:00

ucp.php

Merge branch '3.1.x' into 3.2.x

2016-03-05 12:12:27 +01:00

viewforum.php

…

viewtopic.php

…