aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3781 from Elsensee/ticket/8708-2Tristan Darricau2015-07-223-10/+8
|\ | | | | | | | | | | | | | | [ticket/8708] Add extra permission for posting global announcements * Elsensee/ticket/8708-2: [ticket/8708] Apply permission 'f_announce_global' [ticket/8708] Add f_announce_global permission
| * [ticket/8708] Apply permission 'f_announce_global'Oliver Schramm2015-07-193-10/+8
| | | | | | | | PHPBB3-8708
* | Merge branch '3.1.x'Marc Alexander2015-07-221-2/+74
|\ \ | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_profile.php
| * \ Merge pull request #3719 from javiexin/ticket/13911Marc Alexander2015-07-221-2/+74
| |\ \ | | | | | | | | | | | | [ticket/13911] Add events to configure options for profile fields
| | * | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. Fixed version number again. PHPBB3-13911
| | * | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. Fixed version number and event name. PHPBB3-13911
| | * | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-021-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. Fix bamboo formatting errors. PHPBB3-13911
| | * | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-021-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. PHPBB3-13911
* | | | Merge branch '3.1.x'Marc Alexander2015-07-221-1/+19
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | [ticket/13311] Remove whitespace at end of lineMarc Alexander2015-07-221-1/+1
| | | | | | | | | | | | PHPBB3-13311
| * | [ticket/13311] Update @since to 3.1.6-RC1Marc Alexander2015-07-221-1/+1
| | | | | | | | | | | | PHPBB3-13311
| * | [ticket/13311] Add core event on acp_forums for forum content deletesalf0072015-07-221-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Event added for the function delete_forum_content() in includes/acp/acp_forums.php, so that you can insert any extension's table(s) to be updated when forum content is deleted Incude parameters forum_id, topic_ids and post_counts PHPBB3-13311
* | | Merge branch '3.1.x'Marc Alexander2015-07-171-0/+11
|\ \ \ | |/ /
| * | Merge pull request #3732 from kinerity/ticket/13974Marc Alexander2015-07-171-0/+11
| |\ \ | | | | | | | | | | | | [ticket/13974] Add core.mcp_change_poster_after event
| | * | [ticket/13974] Change userdata type from string to arrayKailey Truscott2015-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change the docblock for userdata from string to array. PHPBB3-13974
| | * | [ticket/13974] Add core.mcp_change_poster_after eventKailey Truscott2015-06-281-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new event to perform additional tasks after chainging a post's poster. PHPBB3-13974
* | | | Merge branch '3.1.x'Marc Alexander2015-07-161-0/+3
|\ \ \ \ | |/ / /
| * | | [ticket/14004] Add user_info to core eventRichard McGirr2015-07-121-0/+3
| | | | | | | | | | | | | | | | PHPBB3-14004
* | | | [ticket/11444] BC layerTristan Darricau2015-07-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11444
* | | | [ticket/11444] Moving the in-board notifications to a method classNicofuma2015-07-138-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the in-board method for the notifications is hardcoded and cannot be disabled. This method should be in his own class extending `phpbb\notification\method\method_interface`. It also add the possibility, for each method, to be enabled by default (ie: no entry in the DB => notification enabled). https://tracker.phpbb.com/browse/PHPBB3-11444 https://tracker.phpbb.com/browse/PHPBB3-11967 PHPBB3-11444
* | | | Merge pull request #3747 from rxu/ticket/13377Tristan Darricau2015-07-132-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13377] Fix decoding for www type URLs in function decode_message()
| * | | | [ticket/13377] Fix decoding for www type URLs in function decode_message()rxu2015-07-072-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13377
* | | | | Merge branch '3.1.x'Marc Alexander2015-07-081-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: tests/template/template_includecss_test.php
| * | | | [ticket/13995] Invalid avatar HTML missing space between elementsMatt Friedman2015-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13995
| * | | | Merge pull request #3654 from s9e/ticket/13880Tristan Darricau2015-06-291-22/+50
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | [ticket/13880] Automatically remove quotes that are nested too deep
* | | | | Merge pull request #3623 from s9e/ticket/10620Tristan Darricau2015-07-073-1/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | [ticket/10620] Quote improvements
| * | | | [ticket/10620] Added enhanced quotes in pm historyJoshyPHP2015-06-251-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10620
| * | | | [ticket/10620] Added enhanced quotes in topic reviewJoshyPHP2015-06-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for enhanced quotes in topic_review's quote button. NOTE: the UI doesn't appear to be testable via PhantomJS. PHPBB3-10620
| * | | | [ticket/10620] Implemented quote improvementsJoshyPHP2015-06-251-1/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-10620
* | | | | Merge pull request #3689 from s9e/ticket/13880-fix-masterTristan Darricau2015-06-291-22/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13880] Merge branch 'fix-3.1' into fix-master
| * \ \ \ \ [ticket/13880] Merge branch 'ticket/13880' into ticket/13880-fix-masterJoshyPHP2015-06-271-22/+63
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | PHPBB3-13880
| | * | | | [ticket/13880] Replaced the quote regexp to allow bracketsJoshyPHP2015-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the regexp used in bbcode::bbcode_cache_init() PHPBB3-13880
| | * | | | [ticket/13880] Automatically remove quotes that are nested too deepJoshyPHP2015-06-271-22/+50
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13880
* | | | | | Merge branch '3.1.x'Joas Schilling2015-06-271-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge pull request #3725 from RMcGirr83/ticket/13962Joas Schilling2015-06-271-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/13962] MCP Queue dropdown for forum selection
| | * | | [ticket/13962] MCP Queue dropdown for forum selectionRMcGirr832015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13962
* | | | | Merge branch '3.1.x'Marc Alexander2015-06-261-1/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | Conflicts: phpBB/includes/mcp/mcp_post.php
| * | | [ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_postCrizzo2015-06-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13966
* | | | Merge pull request #3618 from marc1706/ticket/13832Tristan Darricau2015-06-244-30/+132
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13832] Use preg_replace_callback instead of /e modifier
| * | | | [ticket/13832] Resolve minor coding issuesMarc Alexander2015-05-202-17/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | [ticket/13832] Remove unused global from bbcode_init()Marc Alexander2015-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | [ticket/13832] Use preg_replace_callback in ucp_pm_optionsMarc Alexander2015-05-191-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | [ticket/13832] Use preg_replace_callback in bbcode classMarc Alexander2015-05-191-4/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | [ticket/13832] Use preg_replace_callback in acp_bbcodesMarc Alexander2015-05-191-4/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | [ticket/13832] Fix code sniffer errors in message_parser.phpMarc Alexander2015-05-191-13/+65
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | [ticket/13832] Do not use e modifier for bbcodes in message_parserMarc Alexander2015-05-181-12/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | [ticket/13832] Remove e modifier from bold bbcodeMarc Alexander2015-05-181-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | [ticket/13832] Allow callables for matching bbcodesMarc Alexander2015-05-181-1/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | [ticket/13832] Do not use e modifier in message_parserMarc Alexander2015-05-181-4/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | [ticket/13832] Use preg_replace_callback instead of /e modifierMarc Alexander2015-05-182-3/+23
| | | | | | | | | | | | | | | | | | | | PHPBB3-13832