aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-4/+39
|\
| * Merge pull request #3043 from rxu/ticket/13182Joas Schilling2014-11-211-4/+39
| |\ | | | | | | | | | [ticket/13182] Add posting.php core event to allow modifying the message text
| | * [ticket/13182] Add posting.php core event to allow modifying the message textrxu2014-11-221-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | posting.php core event to allow modifying the message before parsing would be needed for some extensions, like for adding topic title to the topic URL etc. Also removed 'delete' var from core.posting_modify_template_vars and core.modify_posting_parameters as it does not exist. PHPBB3-13182
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-212-1/+50
|\ \ \ | |/ /
| * | Merge pull request #3150 from omniError/ticket/13347Joas Schilling2014-11-212-1/+50
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13347] missing acp_forums template events Conflicts: phpBB/docs/events.md
| | * | [ticket/13347] update event docsomniError2014-11-171-1/+43
| | | | | | | | | | | | | | | | PHPBB3-13347
| | * | [ticket/13347] fix CSomniError2014-11-171-7/+7
| | | | | | | | | | | | | | | | PHPBB3-13347
| | * | [ticket/13347] missing acp_forums template eventsomniError2014-11-171-0/+7
| | | | | | | | | | | | | | | | PHPBB3-13347
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-0/+16
|\ \ \ \ | |/ / /
| * | | Merge pull request #3131 from omniError/ticket/13328Joas Schilling2014-11-211-0/+16
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13328] add core.mcp_view_forum_modify_sql
| | * | | [ticket/13328] fix CSomniError2014-11-111-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328
| | * | | [ticket/13328] add core.mcp_view_forum_modify_sqlomniError2014-11-101-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3130 from omniError/ticket/13326Joas Schilling2014-11-211-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13326] add viewtopic_url to event
| | * | | | [ticket/13326] fix CSomniError2014-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13326 PHPBB3-13326
| | * | | | [ticket/13326] add viewtopic_url to eventomniError2014-11-101-0/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13326 PHPBB3-13326
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-212-4/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/index_body.html
| * | | | Merge pull request #3126 from VSEphpbb/ticket/13290Joas Schilling2014-11-213-4/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13290] Add EVENT index_body_forumlist_body_after
| | * | | | [ticket/13290] Add EVENT index_body_forumlist_body_afterMatt Friedman2014-11-103-4/+16
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13290
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-212-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3122 from Elsensee/ticket/13309Joas Schilling2014-11-212-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13309] Add event acp_email_options_after
| | * | | | [ticket/13309] Add event acp_email_options_afterOliver Schramm2014-11-092-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13309
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+44
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3114 from rxu/ticket/13294Joas Schilling2014-11-211-1/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13294] Add function parse() core event for additional message checks
| | * | | | | [ticket/13294] Add function parse() core event for additional message checksrxu2014-11-201-1/+44
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to the function parse() in includes/message_parser.php to allow additional handling message before parsing (i.e. perform custom message checks, cleanup etc.). PHPBB3-13294
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-212-0/+24
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_search.html
| * | | | | Merge pull request #3071 from rxu/ticket/13220Joas Schilling2014-11-213-0/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13220] Add template events to memberlist_search.html
| | * | | | | [ticket/13220] Add template events to memberlist_search.htmlrxu2014-11-083-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13220
* | | | | | | Merge pull request #2883 from Nicofuma/ticket/12620Nils Adermann2014-11-2176-404/+771
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/12620] Allow the user to define multiples environments
| * | | | | | | [ticket/12620] Fix testsTristan Darricau2014-11-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Remove the old includes/functions_url_matcher.php fileTristan Darricau2014-11-211-102/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Fix functionnal testsTristan Darricau2014-11-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Fix rebaseTristan Darricau2014-11-2011-168/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Use the right environment while installingTristan Darricau2014-11-201-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Fix testsTristan Darricau2014-11-205-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Move the routing.yml file to routing/environment.ymlTristan Darricau2014-11-207-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Use the test environment for the testsTristan Darricau2014-11-2017-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Fix session testsTristan Darricau2014-11-202-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Fix coding styleTristan Darricau2014-11-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Add a test using a custom DI extension in an extensionTristan Darricau2014-11-204-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Use the container to get the environment nameTristan Darricau2014-11-204-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Fix rebase (move config file to the right directory)Tristan Darricau2014-11-2018-911/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Fix testsTristan Darricau2014-11-203-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Creates one di extension per phpBB extensionTristan Darricau2014-11-204-90/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Adds a yaml config fileTristan Darricau2014-11-2038-44/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Updates test environment (production => development)Tristan Darricau2014-11-208-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Uses a cache directory per environmentTristan Darricau2014-11-204-41/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Fix download/file.php and app.php outside of the root_pathTristan Darricau2014-11-202-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Add support of the environments for the ext routing filesTristan Darricau2014-11-207-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
| * | | | | | | [ticket/12620] Fix testsTristan Darricau2014-11-203-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620