aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2471 from bantu/task/sami-ascraeusJoas Schilling2014-05-182-1/+204
|\
| * Merge branch 'task/sami' into task/sami-ascraeusAndreas Fischer2014-05-162-1/+204
| |\
| | * [task/sami] Add sami/sami as a composer development dependency.Andreas Fischer2014-05-162-2/+366
* | | Merge remote-tracking branch 'n-aleha/ticket/12547' into develop-ascraeusCesar G2014-05-1611-10/+10
|\ \ \
| * | | [ticket/12547] Rename jquery.js to jquery.min.js in assets directoryn-aleha2014-05-1511-10/+10
* | | | Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeusCesar G2014-05-168-24/+27
|\ \ \ \
| * | | | [ticket/12525] Add string argument to contact and email user language variablesn-aleha2014-05-178-24/+27
* | | | | Merge remote-tracking branch 'brunoais/ticket/PHPBB3-12533' into develop-ascr...Cesar G2014-05-162-2/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/12533] Make <a> use all the "see all" "button"brunoais2014-05-142-1/+4
| * | | | [ticket/12533] Make <a> use all the notification item sizebrunoais2014-05-141-1/+5
* | | | | Merge pull request #2463 from nickvergessen/ticket/12433Andreas Fischer2014-05-152-2/+11
|\ \ \ \ \
| * | | | | [ticket/12433] Use a different message when nesting of quotes is not allowedJoas Schilling2014-05-152-2/+11
| |/ / / /
* | | | | Merge pull request #2464 from nickvergessen/ticket/11163Andreas Fischer2014-05-151-0/+10
|\ \ \ \ \
| * | | | | [ticket/11163] Add ext/index.htmJoas Schilling2014-05-151-0/+10
| |/ / / /
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-05-152-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | [ticket/12540] Fix broken placeholders in language filesJoas Schilling2014-05-133-3/+3
* | | | Merge pull request #2456 from Nicofuma/ticket/12435Andreas Fischer2014-05-141-8/+21
|\ \ \ \
| * | | | [ticket/12435] Update the commentTristan Darricau2014-05-141-4/+6
| * | | | [ticket/12435] purge_notifications() fails for unused notificationsTristan Darricau2014-05-141-8/+19
| | |/ / | |/| |
* | | | [ticket/12544] Update Plupload to 2.1.2.Cesar G2014-05-131-8/+8
|/ / /
* | | 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-123-8/+12
|\ \ \
| * | | [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
* | | | [ticket/12518] Apply De Morgan to make the conditions easier to readJoas Schilling2014-05-112-3/+3
* | | | [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
|/ / /
* | | [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-112-5/+14
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/12529] Move $phpbb_root_path to the end of the constructorTristan Darricau2014-05-112-5/+6
| * | | [ticket/12529] Use root_path in controller\resolver to check the template dirTristan Darricau2014-05-112-2/+10
* | | | 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-1116-117/+100
|\ \ \ \ \
| * | | | | [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] 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
|\ \ \ \ \