aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-05-180-0/+0
|\
| * Merge pull request #2470 from bantu/task/samiJoas Schilling2014-05-185-155/+418
| |\
* | \ Merge pull request #2471 from bantu/task/sami-ascraeusJoas Schilling2014-05-185-154/+256
|\ \ \
| * \ \ Merge branch 'task/sami' into task/sami-ascraeusAndreas Fischer2014-05-171-1/+2
| |\ \ \ | | | |/ | | |/|
| | * | [task/sami] Establish alphabetical order.Andreas Fischer2014-05-171-1/+1
| | * | [task/sami] Also ignore ext/ directory.Andreas Fischer2014-05-171-0/+1
| * | | Merge branch 'task/sami' into task/sami-ascraeusAndreas Fischer2014-05-165-154/+255
| |\ \ \ | | |/ /
| | * | [task/sami] Replace phpdoctor with sami.Andreas Fischer2014-05-163-153/+51
| | * | [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
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Merge pull request #2454 from nickvergessen/ticket/12540Andreas Fischer2014-05-153-3/+3
| |\ \ \
| | * | | [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
| | |/ / | |/| |
* | | | Merge pull request #2457 from prototech/ticket/12544Andreas Fischer2014-05-141-8/+8
|\ \ \ \ | |/ / / |/| | |
| * | | [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-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