phpbb/phpBB/includes
Marc Alexander 01097a24b5 Merge branch '3.1.x'
Conflicts:
	tests/template/template_includecss_test.php
2015-07-08 22:54:26 +02:00
..
acp Merge pull request #3618 from marc1706/ticket/13832 2015-06-24 16:36:15 +02:00
diff [ticket/12557] Fix pass by reference doc blocks 2014-08-07 11:39:04 +03:00
hooks [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
mcp Merge branch '3.1.x' 2015-06-27 11:06:30 +02:00
questionnaire [ticket/13494] Update calls to set_config() 2015-02-02 19:28:23 +01:00
ucp [ticket/10620] Implemented quote improvements 2015-06-25 03:11:55 +02:00
utf [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback 2014-11-08 11:41:58 +01:00
.htaccess [ticket/9698] Add .htaccess to the includes subdirectory. 2010-10-15 16:47:21 +02:00
bbcode.php Merge pull request #3618 from marc1706/ticket/13832 2015-06-24 16:36:15 +02:00
compatibility_globals.php [ticket/13697] Moving filesystem related functions to filesystem service 2015-04-16 13:24:10 +02:00
constants.php [3.1.x] Update dev version to 3.1.6-RC1 2015-06-11 23:25:43 +02:00
functions.php Merge branch '3.1.x' 2015-07-08 22:54:26 +02:00
functions_acp.php Merge branch '3.1.x' 2015-06-07 14:59:33 +02:00
functions_admin.php Merge branch '3.1.x' 2015-06-09 15:24:08 +02:00
functions_compatibility.php Merge branch '3.1.x' 2015-06-16 12:35:51 +02:00
functions_compress.php [ticket/13697] Moving filesystem related functions to filesystem service 2015-04-16 13:24:10 +02:00
functions_content.php [ticket/13805] Updated generate_text_for_storage() to match message_parser 2015-05-02 01:53:11 +02:00
functions_convert.php Merge branch 'ticket/13930' into ticket/13930-master 2015-06-08 15:39:47 +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 Merge branch '3.1.x' 2015-06-06 18:12:54 +02:00
functions_download.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
functions_install.php [ticket/13697] Moving filesystem related functions to filesystem service 2015-04-16 13:24:10 +02:00
functions_jabber.php [ticket/12487] Update PHP code 2015-01-11 13:22:59 +01:00
functions_mcp.php Merge branch '3.1.x' 2015-03-06 14:30:14 +01:00
functions_messenger.php [ticket/13804] Make template's user dependency optional 2015-05-05 19:16:49 +02:00
functions_module.php Merge branch '3.1.x' 2015-05-30 10:58:40 +02:00
functions_posting.php [ticket/10620] Added enhanced quotes in topic review 2015-06-25 03:11:58 +02:00
functions_privmsgs.php [ticket/10620] Added enhanced quotes in pm history 2015-06-25 03:11:58 +02:00
functions_transfer.php [ticket/12999] Remove @author tags 2014-08-19 22:54:45 +02:00
functions_upload.php Merge pull request #3524 from marc1706/ticket/8672 2015-04-27 16:26:40 +02:00
functions_user.php Merge branch '3.1.x' 2015-06-21 21:53:03 +02:00
index.htm
message_parser.php [ticket/13880] Merge branch 'ticket/13880' into ticket/13880-fix-master 2015-06-27 04:34:12 +02:00
sphinxapi.php [ticket/12721] Update rules descriptions 2014-06-16 23:07:28 +02:00
startup.php Merge branch '3.1.x' 2015-06-09 21:27:56 +02:00