Joas Schilling 24058dfefc Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/includes/bbcode.php

2015-01-09 17:49:30 +01:00

..

acp

Merge branch 'develop-ascraeus' into develop

2015-01-09 17:41:47 +01:00

diff

[ticket/12557] Fix pass by reference doc blocks

2014-08-07 11:39:04 +03:00

hooks

…

mcp

Merge branch 'develop-ascraeus' into develop

2014-11-22 12:08:42 +01:00

questionnaire

[ticket/12775] Remove useless includes of config.php

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

ucp

Merge branch 'develop-ascraeus' into develop

2014-11-21 20:20:45 +01:00

utf

[feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback

2014-11-08 11:41:58 +01:00

.htaccess

…

bbcode.php

Merge branch 'develop-ascraeus' into develop

2015-01-09 17:49:30 +01:00

compatibility_globals.php

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

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

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

[ticket/13045] Remove Pragma headers

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

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

[ticket/13045] Remove Pragma headers

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

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

[ticket/13421] Move tools to subdirectory

2014-12-06 17:10:07 +01:00

functions_jabber.php

…

functions_mcp.php

[ticket/12966] Sort by post_time and post_id where applicable

2014-08-23 16:36:39 +02:00

functions_messenger.php

Merge branch 'develop-ascraeus' into develop

2014-08-10 18:07:11 +02:00

functions_module.php

[ticket/12919] Use the modules basename as identifier for extension modules

2014-08-07 14:06:45 +02:00

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

[ticket/12999] Remove @author tags

2014-08-19 22:54:45 +02:00

functions_upload.php

[ticket/13031] Guess with all mimetype guessers and pick best guess

2014-09-05 10:56:06 +02:00

functions_user.php

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

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

functions.php

[ticket/13440] Update event version to 3.1.3-RC1

2015-01-04 01:40:18 -08:00

index.htm

…

message_parser.php

[ticket/13466] Add bitfield and uid to event core.message_parser_check_message

2015-01-05 22:15:56 +01:00

sphinxapi.php

…

startup.php

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

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