Marc Alexander 94d2be725a Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/includes/ucp/ucp_profile.php

2016-05-15 23:57:16 +02:00

..

acp

Merge branch 'ticket/14577' into ticket/14577-3.2.x

2016-04-02 09:51:37 +02:00

diff

[ticket/13454] Add excessively removed code back

2016-01-06 13:52:11 +01:00

hooks

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

mcp

Merge pull request #3874 from lavigor/ticket/14134

2016-03-26 18:59:31 +01:00

questionnaire

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

ucp

Merge branch '3.1.x' into 3.2.x

2016-05-15 23:57:16 +02:00

utf

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

.htaccess

…

bbcode.php

[ticket/13616] Updates direct call to twig environment constructor

2016-04-03 16:23:16 +02:00

compatibility_globals.php

[ticket/13616] Fix UI tests

2016-04-03 16:23:16 +02:00

constants.php

[3.1.x] Increase version for 3.1.10 development

2016-04-09 19:50:00 +02:00

functions_acp.php

Merge pull request #4021 from marc1706/ticket/14272

2016-03-27 13:34:17 +02:00

functions_admin.php

Revert "[ticket/14562] Language fallback for extension permissions"

2016-04-02 13:10:55 +02:00

functions_compatibility.php

Merge branch '3.1.x'

2015-06-16 12:35:51 +02:00

functions_compress.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

functions_content.php

Merge pull request #4190 from marc1706/ticket/14437

2016-03-25 11:48:29 +01:00

functions_convert.php

Merge branch 'ticket/14577' into ticket/14577-3.2.x

2016-04-02 09:51:37 +02:00

functions_database_helper.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

functions_display.php

[ticket/9435] Add NUM_PREDEFINED_BBCODES constant

2016-03-18 11:02:02 +01:00

functions_download.php

Merge branch '3.1.x' into 3.2.x

2016-03-25 11:10:06 +01:00

functions_jabber.php

[ticket/12487] Update PHP code

2015-01-11 13:22:59 +01:00

functions_mcp.php

[ticket/14325] Preserve event variable BC

2015-11-30 18:05:46 +01:00

functions_messenger.php

[ticket/13616] Updates direct call to twig environment constructor

2016-04-03 16:23:16 +02:00

functions_module.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

functions_posting.php

[ticket/13264] Don't force approved state if post visibility is known (3.2)

2016-03-09 20:25:27 +01:00

functions_privmsgs.php

[ticket/13454] Remove more unused variables

2016-01-06 13:52:11 +01:00

functions_transfer.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

functions_user.php

Merge branch '3.1.x' into 3.2.x

2016-02-13 18:08:01 +01:00

functions.php

Merge branch '3.1.x' into 3.2.x

2016-03-27 12:56:03 +02:00

index.htm

…

message_parser.php

[ticket/9435] Switch "ID" and BBcode name in constants keys

2016-03-19 17:17:03 +01:00

sphinxapi.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

startup.php

Merge branch '3.1.x'

2015-06-09 21:27:56 +02:00