Andreas Fischer 4d0b04a397 Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [ticket/13519] Correctly validate imagick path as path and not string

Conflicts:
	phpBB/includes/acp/acp_attachments.php

2015-01-20 23:11:29 +01:00

..

acp

Merge branch 'develop-olympus' into develop-ascraeus

2015-01-20 23:11:29 +01:00

diff

…

hooks

…

mcp

[ticket/13354] Fix incorrect column name when deleting all topic logs.

2014-11-21 12:48:26 -08:00

questionnaire

…

ucp

Merge pull request #2765 from Elsensee/ticket/11863

2014-11-21 20:18:15 +01:00

utf

…

.htaccess

…

bbcode.php

[ticket/13478] Add event core.bbcode_cache_init_end

2015-01-08 00:13:58 +01:00

compatibility_globals.php

…

constants.php

[prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev

2014-11-25 16:43:43 +01:00

functions_acp.php

…

functions_admin.php

[ticket/13430] update event version

2014-12-12 17:39:30 -06:00

functions_compatibility.php

[ticket/13230] Add missing globals and missing request object for path helper

2014-10-27 14:54:17 +01:00

functions_compress.php

…

functions_content.php

[ticket/13297] Add unicode modifier to url/email regular expression patterns.

2014-11-09 20:59:14 +07:00

functions_convert.php

[ticket/13441] Functions_convert fails to set global moderators default group

2015-01-03 13:45:52 +01:00

functions_database_helper.php

…

functions_display.php

[ticket/13300] Don't show jabber in profile if jabber is disabled

2014-11-09 02:22:39 +01:00

functions_download.php

[ticket/13125] $user->browser to $browser

2014-10-02 15:34:56 +02:00

functions_install.php

…

functions_jabber.php

…

functions_mcp.php

…

functions_messenger.php

…

functions_module.php

…

functions_posting.php

[ticket/13435] Add core event to modify submit_post() sql data

2014-12-13 21:08:01 +07:00

functions_privmsgs.php

[ticket/13205] Explicitly cast ids to integers and reformat SQL

2014-10-22 18:35:07 -04:00

functions_transfer.php

…

functions_upload.php

…

functions_url_matcher.php

…

functions_user.php

[ticket/13207] Move default user notifications settings to user_add()

2014-10-25 14:57:01 -07:00

functions.php

Merge pull request #3055 from marc1706/ticket/13192

2015-01-19 16:45:43 +01:00

index.htm

…

message_parser.php

Merge pull request #3189 from rxu/ticket/12926

2015-01-10 00:09:57 +01:00

sphinxapi.php

…

startup.php

Merge branch 'develop-olympus' into prep-release-3.1.2

2014-11-25 16:36:32 +01:00