aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3622 from s9e/ticket/13860Tristan Darricau2015-05-292-24/+37
|\ | | | | | | [ticket/13860] Fixed array-to-string conversion
| * [ticket/13860] Fixed PHP notices from undeclared vars/propertiesJoshyPHP2015-05-281-23/+30
| | | | | | | | PHPBB3-13860
| * [ticket/13860] Fixed array-to-string conversionJoshyPHP2015-05-281-1/+7
| | | | | | | | PHPBB3-13860
* | Merge pull request #3625 from s9e/ticket/11742Tristan Darricau2015-05-297-54/+16
|\ \ | | | | | | | | | [ticket/11742] Remove tabs-to-space conversion in [code]
| * | [ticket/11742] Added testJoshyPHP2015-05-231-0/+4
| | | | | | | | | | | | PHPBB3-11742
| * | [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] Updated default formatting tests to match the new defaultJoshyPHP2015-05-231-4/+4
| | | | | | | | | | | | PHPBB3-11742
| * | [ticket/11742] Removed tabs-to-space conversion in [code]JoshyPHP2015-05-234-45/+4
| | | | | | | | | | | | PHPBB3-11742
* | | Merge pull request #3648 from marc1706/ticket/13872Joas Schilling2015-05-291-5/+0
|\ \ \ | | | | | | | | [ticket/13872] Remove subsilver2 from md exporter test
| * | | [ticket/13872] Remove subsilver2 from md exporter testMarc Alexander2015-05-281-5/+0
| | | | | | | | | | | | | | | | PHPBB3-13872
* | | | Merge pull request #3554 from Nicofuma/ticket/13770Nils Adermann2015-05-2913-349/+327
|\ \ \ \ | | | | | | | | | | [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-146-72/+44
| | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge remote-tracking branch 'marc1706/ticket/13878' into 3.1.xCesar G2015-05-281-0/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * marc1706/ticket/13878: [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-285-7/+200
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3633 from nickvergessen/ticket/13872Marc Alexander2015-05-285-7/+200
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13872] Allow template events to have a changed version
| | * | | | | [ticket/13872] Allow template events to have a changed versionJoas Schilling2015-05-285-7/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | [ticket/12542] Use more specific CSS for drag-n-dropMarc Alexander2015-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the CSS gets overwritten by other CSS rules. PHPBB3-12542
| | * | | | | | [ticket/12542] Do not use browser specific css for outlineMarc Alexander2015-05-232-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, the CSS selector for the drag'n'drop was simplified to only use the class. PHPBB3-12542
| | * | | | | | [ticket/12542] Properly check if textarea is undefined or nullMarc Alexander2015-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12542
| | * | | | | | [ticket/12542] Use extended CSS for all browsersMarc Alexander2015-04-292-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12542
| | * | | | | | [ticket/12542] Rename javascript method and add doc blockMarc Alexander2015-04-292-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12542
| | * | | | | | [ticket/12542] Add different outline colors for body & textareaMarc Alexander2015-04-292-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12542
| | * | | | | | [ticket/12542] Add initial drag-n-drop animationMarc Alexander2015-04-284-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12542
* | | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-281-0/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| * | | | | | | Merge pull request #3469 from brunoais/ticket/13672Joas Schilling2015-05-281-0/+20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13672] Allow changing the data from the user-submitted report * brunoais/ticket/13672: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| | * | | | | | | [ticket/13672] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13672
| | * | | | | | | [ticket/13672] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13672
| | * | | | | | | [ticket/13672] Allow changing the data from the user-submitted reportbrunoais2015-03-051-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13672
* | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-281-5/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13668] Removed bogus sting concatenation [ticket/13668] BUMP version to 3.1.5-dev [ticket/13668] Allow changing the query to obtain the user-submitted report. [ticket/13668] Convert the mcp report_details query to a built query Conflicts: phpBB/includes/mcp/mcp_reports.php
| * | | | | | | | Merge pull request #3468 from brunoais/ticket/13668Joas Schilling2015-05-281-5/+33
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13668] Allow changing the query to obtain the user-submitted report * brunoais/ticket/13668: [ticket/13668] Removed bogus sting concatenation [ticket/13668] BUMP version to 3.1.5-dev [ticket/13668] Allow changing the query to obtain the user-submitted report. [ticket/13668] Convert the mcp report_details query to a built query
| | * | | | | | | | [ticket/13668] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
| | * | | | | | | | [ticket/13668] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-04 17:06:31 +0000