aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12503] All tests should extend \phpbb_test_caseJoas Schilling2014-05-056-6/+6
| | | | PHPBB3-12503
* Merge pull request #2409 from prototech/ticket/12491Joas Schilling2014-05-052-4/+4
|\ | | | | | | | | | | | | [ticket/12491] Fix clashing USERNAME_FULL template variable. * prototech/ticket/12491: [ticket/12491] Fix clashing USERNAME_FULL template variable.
| * [ticket/12491] Fix clashing USERNAME_FULL template variable.Cesar G2014-05-042-4/+4
| | | | | | | | | | | | The user notes and user warn pages have a variable with the same name. PHPBB3-12491
* | Merge remote-tracking branch 'MGaetan89/ticket/12415' into develop-ascraeusCesar G2014-05-041-2/+2
|\ \ | | | | | | | | | | | | * MGaetan89/ticket/12415: [ticket/12415] Use private message instead of "pm" accronym
| * | [ticket/12415] Use private message instead of "pm" accronymGaƫtan Muller2014-05-041-2/+2
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12415 PHPBB3-12415
* | | Merge pull request #2407 from Nicofuma/ticket/12499Andreas Fischer2014-05-041-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate * Nicofuma/ticket/12499: [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate
| * | [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrateTristan Darricau2014-05-041-1/+1
|/ / | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12499 PHPBB3-12499
* | Merge branch 'prep-release-3.1.0-b3' into develop-ascraeusJoas Schilling2014-05-048-36/+234
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0-b3: [prep-release-3.1.0-b3] Update phpBB Version for b4 development [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3 [prep-release-3.1.0-b3] Prepare Changelog [prep-release-3.1.0-b3] Add migration for 3.1.0-b3 [prep-release-3.1.0-b3] Update version to 3.1.0-b3
| * | [prep-release-3.1.0-b3] Update phpBB Version for b4 developmentJoas Schilling2014-05-043-5/+5
| | |
| * | [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3Joas Schilling2014-05-041-0/+163
| | |
| * | [prep-release-3.1.0-b3] Prepare ChangelogJoas Schilling2014-05-041-26/+29
| | |
| * | [prep-release-3.1.0-b3] Add migration for 3.1.0-b3Joas Schilling2014-05-041-0/+32
| | |
| * | [prep-release-3.1.0-b3] Update version to 3.1.0-b3Joas Schilling2014-05-046-8/+8
|/ /
* | Merge pull request #2405 from Nicofuma/ticket/12494Joas Schilling2014-05-041-0/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12494] Undefined index: user_type on viewtopic.php * Nicofuma/ticket/12494: [ticket/12494] Undefined index: user_type on viewtopic.php
| * | [ticket/12494] Undefined index: user_type on viewtopic.phpTristan Darricau2014-05-041-0/+1
| | | | | | | | | | | | PHPBB3-12494
* | | Merge pull request #2394 from VSEphpbb/ticket/12484Joas Schilling2014-05-043-0/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12484] Add template event ucp_agreement_terms_before/after * VSEphpbb/ticket/12484: [ticket/12484] Add template event ucp_agreement_terms_before/after
| * | | [ticket/12484] Add template event ucp_agreement_terms_before/afterMatt Friedman2014-05-023-0/+20
| | | | | | | | | | | | | | | | PHPBB3-12484
* | | | Merge pull request #2315 from PayBas/ticket/12411Joas Schilling2014-05-041-3/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12411] Expand vars of event: core.search_modify_tpl_ary * PayBas/ticket/12411: [ticket/12411] Improved change documentation [ticket/12411] Missed on bool var [ticket/12411] Corrected event vars description [ticket/12411] Expand vars of event: core.search_modify_tpl_ary
| * | | | [ticket/12411] Improved change documentationPayBas2014-05-021-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-12411
| * | | | [ticket/12411] Missed on bool varPayBas2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sloppy PHPBB3-12411
| * | | | [ticket/12411] Corrected event vars descriptionPayBas2014-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12411
| * | | | [ticket/12411] Expand vars of event: core.search_modify_tpl_aryPayBas2014-05-021-3/+35
| | | | | | | | | | | | | | | | | | | | PHPBB3-12411
* | | | | Merge pull request #2294 from PayBas/ticket/12392Joas Schilling2014-05-041-22/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12392] Include $profile_fields in core.memberlist_view_profile * PayBas/ticket/12392: [ticket/12392] Fix avatar double assignment bug [ticket/12392] Include $profile_fields in core.memberlist_view_profile
| * | | | | [ticket/12392] Fix avatar double assignment bugPayBas2014-05-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12392
| * | | | | [ticket/12392] Include $profile_fields in core.memberlist_view_profilePayBas2014-05-021-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12392
* | | | | | Merge pull request #2257 from PayBas/ticket/12366Joas Schilling2014-05-041-7/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12366] Add Event core.search_get_posts_data * PayBas/ticket/12366: [ticket/12366] Fixed missing comma [ticket/12366] Conform to new event coding guidelines [ticket/12366] Expanded event vars [ticket/12366] Include ORDER BY into the query builder [ticket/12366] Changed to sql_build_query [ticket/12366] Add Event core.search_get_posts_data
| * | | | | | [ticket/12366] Fixed missing commaPayBas2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12366
| * | | | | | [ticket/12366] Conform to new event coding guidelinesPayBas2014-05-021-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12366
| * | | | | | [ticket/12366] Expanded event varsPayBas2014-05-021-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12366
| * | | | | | [ticket/12366] Include ORDER BY into the query builderPayBas2014-05-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12366
| * | | | | | [ticket/12366] Changed to sql_build_queryPayBas2014-05-021-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12366
| * | | | | | [ticket/12366] Add Event core.search_get_posts_dataPayBas2014-05-021-3/+18
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-12366
* | | | | | Merge pull request #2203 from PayBas/ticket/12323Joas Schilling2014-05-042-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12323] Template Event search_results_postprofile_before/after * PayBas/ticket/12323: [ticket/12323] Template Event search_results_postprofile_before Conflicts: phpBB/docs/events.md
| * | | | | | [ticket/12323] Template Event search_results_postprofile_beforePayBas2014-05-032-0/+16
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-12323
* | | | | | Merge pull request #2346 from PayBas/ticket/12438Joas Schilling2014-05-043-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12438] Add Template event memberlist_view_content_prepend * PayBas/ticket/12438: [ticket/12438] Add Template event memberlist_view_content_prepend
| * | | | | | [ticket/12438] Add Template event memberlist_view_content_prependPayBas2014-05-023-0/+12
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-12438
* | | | | | Merge pull request #2314 from PayBas/ticket/12410Joas Schilling2014-05-043-0/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12410] Add Template events search_results_post_ b/a * PayBas/ticket/12410: [ticket/12410] Add Template events search_results_post_ b/a
| * | | | | | [ticket/12410] Add Template events search_results_post_ b/aPayBas2014-05-033-0/+20
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-12410
* | | | | | Merge pull request #2297 from PayBas/ticket/12396Joas Schilling2014-05-045-4/+28
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12396] Add Template events viewforum_forum_name_append/prepend * PayBas/ticket/12396: [ticket/12396] Added missing viewtopic_topic_title_append [ticket/12396] Add Template events viewforum_forum_name
| * | | | | [ticket/12396] Added missing viewtopic_topic_title_appendPayBas2014-05-033-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebased for travis... again PHPBB3-12396
| * | | | | [ticket/12396] Add Template events viewforum_forum_namePayBas2014-05-033-2/+18
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12396
* | | | | Merge pull request #2273 from PayBas/ticket/12376Joas Schilling2014-05-043-2/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12376] Add template events viewtopic_body_polls * PayBas/ticket/12376: [ticket/12376] Changed to viewtopic_body_poll_option_before and after [ticket/12376] Added viewtopic_body_poll_question_append [ticket/12376] Add template events viewtopic_body_polls
| * | | | | [ticket/12376] Changed to viewtopic_body_poll_option_before and afterPayBas2014-05-033-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12376
| * | | | | [ticket/12376] Added viewtopic_body_poll_question_appendPayBas2014-05-033-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12376
| * | | | | [ticket/12376] Add template events viewtopic_body_pollsPayBas2014-05-033-2/+34
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12376
* | | | | Merge pull request #2270 from PayBas/ticket/12374Joas Schilling2014-05-043-7/+85
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12374] Add Template events index_body_block_(name)_append * PayBas/ticket/12374: [ticket/12374] Fixed alphabetical sorting [ticket/12374] Added prepend-versions of events [ticket/12374] Updated code layout [ticket/12374] Add Template events index_body_block_(name)_append
| * | | | | [ticket/12374] Fixed alphabetical sortingPayBas2014-05-031-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12374
| * | | | | [ticket/12374] Added prepend-versions of eventsPayBas2014-05-033-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12374
| * | | | | [ticket/12374] Updated code layoutPayBas2014-05-032-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12374
| * | | | | [ticket/12374] Add Template events index_body_block_(name)_appendPayBas2014-05-033-6/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully to the correct branch this time PHPBB3-12374