aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12543] Only take over ENTER and ESC keys when alert box is active.Cesar G2014-05-131-2/+2
* Merge pull request #2452 from n-aleha/ticket/12519Joas Schilling2014-05-131-1/+1
|\
| * [ticket/12519] Restore m_approve language descriptionn-aleha2014-05-121-1/+1
* | Merge remote-tracking branch 'nickvergessen/ticket/12534' into develop-ascraeusMarc Alexander2014-05-124-10/+14
|\ \
| * | [ticket/12534] Fix filter for functional testsJoas Schilling2014-05-121-2/+2
| * | [ticket/12534] Do not use errorbox for multi stepsJoas Schilling2014-05-122-2/+2
| * | [ticket/12534] Do not abuse errorbox for en/disable confirmation of extensionsJoas Schilling2014-05-123-6/+10
* | | Merge pull request #2446 from nickvergessen/ticket/12518Andreas Fischer2014-05-122-3/+3
|\ \ \
| * | | [ticket/12518] Apply De Morgan to make the conditions easier to readJoas Schilling2014-05-112-3/+3
|/ / /
* | | Merge remote-tracking branch 'nickvergessen/ticket/12518' into develop-ascraeusMarc Alexander2014-05-112-26/+93
|\ \ \ | |/ / |/| |
| * | [ticket/12518] Add event to overwrite the cannot edit condition in posting.phpJoas Schilling2014-05-111-11/+38
| * | [ticket/12518] Add event to overwrite the allow edit and delete conditionsJoas Schilling2014-05-111-15/+55
|/ /
* | Merge pull request #2442 from Elsensee/ticket/12451-2Joas Schilling2014-05-111-1/+1
|\ \
| * | [ticket/12451] Fix whitespace in posting.php lang fileOliver Schramm2014-05-111-1/+1
|/ /
* | Merge pull request #2438 from marc1706/ticket/12517Joas Schilling2014-05-112-2/+9
|\ \
| * | [ticket/12517] Correctly call $log->add in prune shadow topicsMarc Alexander2014-05-112-2/+9
* | | Merge pull request #2439 from prototech/ticket/12526Joas Schilling2014-05-111-1/+1
|\ \ \ | |_|/ |/| |
| * | [ticket/12526] Fix undefined index: filesize when editing PM with attachments.Cesar G2014-05-111-1/+1
* | | Merge pull request #2441 from Nicofuma/ticket/12529Joas Schilling2014-05-113-6/+15
|\ \ \ | |/ / |/| |
| * | [ticket/12529] Move $phpbb_root_path to the end of the constructorTristan Darricau2014-05-113-6/+7
| * | [ticket/12529] Use root_path in controller\resolver to check the template dirTristan Darricau2014-05-113-3/+11
* | | Merge pull request #2412 from prototech/ticket/12501Joas Schilling2014-05-111-2/+10
|\ \ \
| * | | [ticket/12501] Only select attachments uploaded before the post was reported.Cesar G2014-05-051-0/+1
| * | | [ticket/12501] Parse the reported post message before its attachments.Cesar G2014-05-051-2/+9
* | | | Merge pull request #2420 from prototech/ticket/9388Joas Schilling2014-05-1117-119/+102
|\ \ \ \
| * | | | [ticket/9388] Use "togglable" instead of "toggable"Cesar G2014-05-097-7/+7
| * | | | [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.Cesar G2014-05-081-3/+2
| * | | | [ticket/9388] Reopen <fieldset> after auth templates.Cesar G2014-05-081-1/+3
| * | | | [ticket/9388] Fix unit tests.Cesar G2014-05-081-2/+2
| * | | | [ticket/9388] Use the new toggle function for the avatar type <select>.Cesar G2014-05-087-61/+8
| * | | | [ticket/9388] Display only the settings for the selected search backend.Cesar G2014-05-082-6/+8
| * | | | [ticket/9388] Display only the settings for the auth method that's selected.Cesar G2014-05-085-48/+55
| * | | | [ticket/9388] Add support for making <select> options able to toggle settings.Cesar G2014-05-082-1/+27
| | |/ / | |/| |
* | | | Merge pull request #2437 from rxu/ticket/12524Joas Schilling2014-05-111-0/+24
|\ \ \ \
| * | | | [ticket/12524] Add search.php core event to modify search results rowsetrxu2014-05-111-0/+24
* | | | | Merge pull request #2340 from PayBas/ticket/12431Joas Schilling2014-05-117-0/+11
|\ \ \ \ \
| * | | | | [ticket/12431] Lang full sentencePayBas2014-05-081-1/+1
| * | | | | Merge pull request #4 from prototech/ticket/12431PayBas2014-05-042-3/+3
| |\ \ \ \ \
| | * | | | | [ticket/12431] Add topic poll icon.Cesar G2014-05-042-3/+3
| |/ / / / /
| * | | | | [ticket/12431] Add has_poll icon to topiclistsPayBas2014-05-026-0/+11
* | | | | | Merge pull request #2436 from rxu/ticket/12523Joas Schilling2014-05-113-0/+20
|\ \ \ \ \ \
| * | | | | | [ticket/12523] Add template events search_results_topic_(before/after)rxu2014-05-113-0/+20
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2306 from marc1706/ticket/12407Joas Schilling2014-05-111-13/+51
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [ticket/12407] Remove merge marker from posting.phpMarc Alexander2014-05-111-1/+0
| * | | | | [ticket/12407] Fix incorrect @since line in eventMarc Alexander2014-05-111-1/+1
| * | | | | Merge branch 'develop-ascraeus' of github.com:phpbb/phpbb into ticket/12407Marc Alexander2014-05-08327-1913/+10487
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | [ticket/12407] Merge @change in doc block of eventMarc Alexander2014-04-201-4/+3
| * | | | | [ticket/12407] Assign template variables again after merging develop-ascraeusMarc Alexander2014-04-161-0/+3
| * | | | | Merge branch 'develop-ascraeus' of https://github.com/phpbb/phpbb into ticket...Marc Alexander2014-04-1611-34/+138
| |\ \ \ \ \
| * | | | | | [ticket/12407] Add message_parser as passed variable to eventMarc Alexander2014-04-141-1/+2