aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Nils Adermann2015-05-3019-235/+207
|\
| * Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3020-50/+34
| |\
| | * [ticket/13790] Update phpcsTristan Darricau2015-05-1920-50/+34
* | | Merge pull request #3561 from s9e/ticket/10922Tristan Darricau2015-05-291-2/+13
|\ \ \
| * | | [ticket/10922] Replaced urlencode() with rawurlencode()JoshyPHP2015-04-281-1/+1
| * | | [ticket/10922] Added support for body and subject in email BBCodeJoshyPHP2015-04-281-2/+13
* | | | Merge pull request #3383 from nickvergessen/ticket/9109Tristan Darricau2015-05-293-15/+34
|\ \ \ \
| * | | | [ticket/9109] Improve docblock and fix spelling errorsMarc Alexander2015-02-082-2/+3
| * | | | [ticket/9109] Only query database once in phpbb_get_max_setting_from_groupMarc Alexander2015-02-081-20/+5
| * | | | [ticket/9109] Properly document and calculate the group settings with value 0Joas Schilling2015-02-083-15/+48
* | | | | Merge pull request #3613 from nickvergessen/ticket/13844Tristan Darricau2015-05-2919-32/+1069
|\ \ \ \ \
| * | | | | [ticket/13844] Add eventsJoas Schilling2015-05-203-14/+59
| * | | | | [ticket/13844] Remove hacky code for the help arrayJoas Schilling2015-05-172-15/+4
| * | | | | [ticket/13844] Fix language file so the tests passJoas Schilling2015-05-163-6/+6
| * | | | | [ticket/13844] FAQ in new controller formatJoas Schilling2015-05-1612-19/+187
| * | | | | [ticket/13844] Refactor bbcode help to the new systemJoas Schilling2015-05-165-0/+271
| * | | | | [ticket/13844] Add new versions of the old help_* filesJoas Schilling2015-05-162-0/+252
| * | | | | [ticket/13844] Add a little develop script to migrate the filesJoas Schilling2015-05-161-0/+312
* | | | | | Merge pull request #3616 from s9e/ticket/13847Tristan Darricau2015-05-294-3/+65
|\ \ \ \ \ \
| * | | | | | [ticket/13847] Updated ucp_pm_compose to use utils when forwardingJoshyPHP2015-05-251-1/+5
| * | | | | | [ticket/13847] Updated ucp_pm_compose to use the utils serviceJoshyPHP2015-05-251-1/+5
| * | | | | | [ticket/13847] Changed enquote() logic to use whichever is the shortestJoshyPHP2015-05-251-3/+4
| * | | | | | [ticket/13847] Move quote generation to text_formatter.utilsJoshyPHP2015-05-253-1/+54
* | | | | | | Merge pull request #3622 from s9e/ticket/13860Tristan Darricau2015-05-291-1/+7
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13860] Fixed array-to-string conversionJoshyPHP2015-05-281-1/+7
* | | | | | | | Merge pull request #3625 from s9e/ticket/11742Tristan Darricau2015-05-294-50/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11742] Updated s9e\TextFormatterJoshyPHP2015-05-231-4/+4
| * | | | | | | | [ticket/11742] Removed whitespace collapsing in codebox [ci skip]JoshyPHP2015-05-231-1/+0
| * | | | | | | | [ticket/11742] Removed tabs-to-space conversion in [code]JoshyPHP2015-05-232-45/+2
* | | | | | | | | Merge pull request #3554 from Nicofuma/ticket/13770Nils Adermann2015-05-299-279/+287
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13770] Use dummy cache driverNicofuma2015-05-141-1/+1
| * | | | | | | | | [ticket/13770] Fix testsNicofuma2015-05-143-43/+53
| * | | | | | | | | [ticket/13770] Update testsTristan Darricau2015-05-142-2/+4
| * | | | | | | | | [ticket/13770] Wither interface for container_builderTristan Darricau2015-05-149-294/+290
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-281-1/+16
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #3640 from callumacrae/ticket/13876Marc Alexander2015-05-281-1/+16
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/13876] set webfont async to trueCallum Macrae2015-05-281-0/+1
| | * | | | | | | | | [ticket/13876] Use webfontloader asyncronously.Callum Macrae2015-05-281-1/+15
* | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-281-27/+27
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #3634 from prototech/ticket/13858Marc Alexander2015-05-281-27/+27
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [ticket/13858] Make Plupload uploader available in the global namespace.Cesar G2015-05-281-27/+27
* | | | | | | | | | | | Merge branch '3.1.x'Cesar G2015-05-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | [ticket/13878] Display background images when printing topic in webkitMarc Alexander2015-05-281-0/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-281-8/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #3637 from callumacrae/ticket/13873Marc Alexander2015-05-281-8/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [ticket/13873] Removed broken print stylesheet.Callum Macrae2015-05-281-8/+7
| | |/ / / / / / / / /
* | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-282-3/+87
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #3633 from nickvergessen/ticket/13872Marc Alexander2015-05-282-3/+87
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [ticket/13872] Allow template events to have a changed versionJoas Schilling2015-05-282-3/+87
* | | | | | | | | | | | Merge branch '3.1.x'Cesar G2015-05-284-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /