aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13388] Address commentsTristan Darricau2015-05-291-5/+4
| | | | PHPBB3-13388
* [ticket/13388] Integrate routing and di parameters resolutionTristan Darricau2015-05-292-7/+124
| | | | PHPBB3-13388
* Merge pull request #3561 from s9e/ticket/10922Tristan Darricau2015-05-291-2/+13
|\ | | | | | | [ticket/10922] Added support for body and subject in email BBCode
| * [ticket/10922] Replaced urlencode() with rawurlencode()JoshyPHP2015-04-281-1/+1
| | | | | | | | | | | | | | RFC-6068 asks for percent-encoding so that seems more correct. Not sure about that one. PHPBB3-10922
| * [ticket/10922] Added support for body and subject in email BBCodeJoshyPHP2015-04-281-2/+13
| | | | | | | | PHPBB3-10922
* | Merge pull request #3383 from nickvergessen/ticket/9109Tristan Darricau2015-05-293-15/+34
|\ \ | | | | | | | | | Ticket/9109 Properly document and calculate the group settings with value 0
| * | [ticket/9109] Improve docblock and fix spelling errorsMarc Alexander2015-02-082-2/+3
| | | | | | | | | | | | PHPBB3-9109
| * | [ticket/9109] Only query database once in phpbb_get_max_setting_from_groupMarc Alexander2015-02-081-20/+5
| | | | | | | | | | | | | | | | | | More test cases have been added, too. PHPBB3-9109
| * | [ticket/9109] Properly document and calculate the group settings with value 0Joas Schilling2015-02-083-15/+48
| | | | | | | | | | | | PHPBB3-9109
* | | Merge pull request #3613 from nickvergessen/ticket/13844Tristan Darricau2015-05-2919-32/+1069
|\ \ \ | | | | | | | | | | | | Ticket/13844 Better FAQ language files
| * | | [ticket/13844] Add eventsJoas Schilling2015-05-203-14/+59
| | | | | | | | | | | | | | | | PHPBB3-13844
| * | | [ticket/13844] Remove hacky code for the help arrayJoas Schilling2015-05-172-15/+4
| | | | | | | | | | | | | | | | PHPBB3-13844
| * | | [ticket/13844] Fix language file so the tests passJoas Schilling2015-05-163-6/+6
| | | | | | | | | | | | | | | | PHPBB3-13844
| * | | [ticket/13844] FAQ in new controller formatJoas Schilling2015-05-1612-19/+187
| | | | | | | | | | | | | | | | PHPBB3-13844
| * | | [ticket/13844] Refactor bbcode help to the new systemJoas Schilling2015-05-165-0/+271
| | | | | | | | | | | | | | | | PHPBB3-13844
| * | | [ticket/13844] Add new versions of the old help_* filesJoas Schilling2015-05-162-0/+252
| | | | | | | | | | | | | | | | PHPBB3-13844
| * | | [ticket/13844] Add a little develop script to migrate the filesJoas Schilling2015-05-161-0/+312
| | | | | | | | | | | | | | | | PHPBB3-13844
* | | | Merge pull request #3616 from s9e/ticket/13847Tristan Darricau2015-05-294-3/+65
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13847] Move quote generation to text_formatter.utils
| * | | | [ticket/13847] Updated ucp_pm_compose to use utils when forwardingJoshyPHP2015-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13847
| * | | | [ticket/13847] Updated ucp_pm_compose to use the utils serviceJoshyPHP2015-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...when quoting a post PHPBB3-13847
| * | | | [ticket/13847] Changed enquote() logic to use whichever is the shortestJoshyPHP2015-05-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will enclose attribute values in single- or double- quotes depending on whichever requires the least escaping. Characters that need to be escaped are always escaped regardless. PHPBB3-13847
| * | | | [ticket/13847] Move quote generation to text_formatter.utilsJoshyPHP2015-05-253-1/+54
| | | | | | | | | | | | | | | | | | | | PHPBB3-13847
* | | | | Merge pull request #3622 from s9e/ticket/13860Tristan Darricau2015-05-291-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13860] Fixed array-to-string conversion
| * | | | | [ticket/13860] Fixed array-to-string conversionJoshyPHP2015-05-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13860
* | | | | | Merge pull request #3625 from s9e/ticket/11742Tristan Darricau2015-05-294-50/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/11742] Remove tabs-to-space conversion in [code]
| * | | | | | [ticket/11742] Updated s9e\TextFormatterJoshyPHP2015-05-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11742
| * | | | | | [ticket/11742] Removed whitespace collapsing in codebox [ci skip]JoshyPHP2015-05-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11742
| * | | | | | [ticket/11742] Removed tabs-to-space conversion in [code]JoshyPHP2015-05-232-45/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11742
* | | | | | | Merge pull request #3554 from Nicofuma/ticket/13770Nils Adermann2015-05-299-279/+287
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/13770] Wither interface for container_builder
| * | | | | | | [ticket/13770] Use dummy cache driverNicofuma2015-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13770
| * | | | | | | [ticket/13770] Fix testsNicofuma2015-05-143-43/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13770
| * | | | | | | [ticket/13770] Update testsTristan Darricau2015-05-142-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13770
| * | | | | | | [ticket/13770] Wither interface for container_builderTristan Darricau2015-05-149-294/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13770
* | | | | | | | 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] Use webfontloader asyncronously.
| | * | | | | | | | [ticket/13876] set webfont async to trueCallum Macrae2015-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13876
| | * | | | | | | | [ticket/13876] Use webfontloader asyncronously.Callum Macrae2015-05-281-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR adds typekit and Google's webfontloader and calls it asyncronously, removing the SPOF in the header. Now, if google goes down, some buttons display with a different font. https://github.com/typekit/webfontloader PHPBB3-13876
* | | | | | | | | | 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.
| | * | | | | | | | | [ticket/13858] Make Plupload uploader available in the global namespace.Cesar G2015-05-281-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13858
* | | | | | | | | | | Merge branch '3.1.x'Cesar G2015-05-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13878] Display background images when printing topic in webkit
| * | | | | | | | | | [ticket/13878] Display background images when printing topic in webkitMarc Alexander2015-05-281-0/+1
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13878
* | | | | | | | | | 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.
| | * | | | | | | | | [ticket/13873] Removed broken print stylesheet.Callum Macrae2015-05-281-8/+7
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13873
* | | | | | | | | | 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 version
| | * | | | | | | | | [ticket/13872] Allow template events to have a changed versionJoas Schilling2015-05-282-3/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13872
* | | | | | | | | | | Merge branch '3.1.x'Cesar G2015-05-284-0/+43
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/12542] Use more specific CSS for drag-n-drop [ticket/12542] Do not use browser specific css for outline [ticket/12542] Properly check if textarea is undefined or null [ticket/12542] Use extended CSS for all browsers [ticket/12542] Rename javascript method and add doc block [ticket/12542] Add different outline colors for body & textarea [ticket/12542] Add initial drag-n-drop animation
| * | | | | | | | | | Merge remote-tracking branch 'marc1706/ticket/12542' into 3.1.xCesar G2015-05-284-0/+43
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/12542: [ticket/12542] Use more specific CSS for drag-n-drop [ticket/12542] Do not use browser specific css for outline [ticket/12542] Properly check if textarea is undefined or null [ticket/12542] Use extended CSS for all browsers [ticket/12542] Rename javascript method and add doc block [ticket/12542] Add different outline colors for body & textarea [ticket/12542] Add initial drag-n-drop animation