aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13685] BUMP version to 3.1.5-devbrunoais2015-06-071-1/+1
| | | | PHPBB3-13685
* [ticket/13685] Allow modifying the query for mysql native fulltext searchbrunoais2015-06-071-0/+49
| | | | PHPBB3-13685
* [ticket/13685] Fix tests for fulltext searchbrunoais2015-06-073-3/+6
| | | | PHPBB3-13685
* [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-0714-18/+50
| | | | PHPBB3-13685
* Merge pull request #3638 from naderman/ticket/13874Oliver Schramm2015-05-301-0/+1
|\ | | | | | | [ticket/13874] Add master to sami API docs
| * [ticket/13874] Add master to sami API docsNils Adermann2015-05-281-0/+1
| | | | | | | | PHPBB3-13874
* | Merge pull request #3658 from callumacrae/js-refactoring-againMarc Alexander2015-05-305-262/+200
|\ \ | | | | | | | | | JS Refactoring
| * | [ticket/13887] Made readable code DRYCallum Macrae2015-05-291-16/+13
| | | | | | | | | | | | PHPBB3-13887
| * | [ticket/13887] Made unreadable code readableCallum Macrae2015-05-291-14/+12
| | | | | | | | | | | | PHPBB3-13887
| * | [ticket/13887] Minor JS refactoringCallum Macrae2015-05-295-58/+63
| | | | | | | | | | | | PHPBB3-13887
| * | [ticket/13887] Use correct JSDoc syntaxCallum Macrae2015-05-293-190/+128
| | | | | | | | | | | | PHPBB3-13887
* | | Merge pull request #3545 from VSEphpbb/ticket/13771Marc Alexander2015-05-301-2/+9
|\ \ \ | | | | | | | | | | | | [ticket/13771] Allow AJAX errors to support exceptions messages
| * | | [ticket/13771] Only handle valid JQHXR response objectsMatt Friedman2015-05-041-4/+7
| | | | | | | | | | | | | | | | PHPBB3-13771
| * | | [ticket/13771] Allow AJAX errors to support exceptions messagesMatt Friedman2015-04-211-1/+5
| | | | | | | | | | | | | | | | PHPBB3-13771
* | | | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3023-126/+109
|\ \ \ \ | | | | | | | | | | [ticket/13790] Update phpcs
| * | | | [ticket/13790] Update phpcsTristan Darricau2015-05-1923-126/+109
| | | | | | | | | | | | | | | | | | | | PHPBB3-13790
* | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-05-291-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0.x: [ticket/13875] Ignore cache, ext, and store folder in lint test Conflicts: tests/lint_test.php
| * | | | Merge pull request #3639 from marc1706/ticket/13875Andreas Fischer2015-05-291-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13875] Ignore cache, ext, and store folder in lint test * marc1706/ticket/13875: [ticket/13875] Ignore cache, ext, and store folder in lint test
| | * | | | [ticket/13875] Ignore cache, ext, and store folder in lint testMarc Alexander2015-05-281-0/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13875
* | | | | 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 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 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 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 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 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 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 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
| * | | | | | | | [ticket/13668] Allow changing the query to obtain the user-submitted report.brunoais2015-03-051-0/+19
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
| * | | | | | | [ticket/13668] Convert the mcp report_details query to a built querybrunoais2015-03-051-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13668
* | | | | | | | Merge pull request #3457 from brunoais/ticket/13661Joas Schilling2015-05-281-15/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13661] Add event to allow editing the queries used to get the logs * brunoais/ticket/13661: [ticket/13661] BUMP version to 3.1.5-dev [ticket/13661] Brackets in their own line [ticket/13661] Re-Fixed $log_type -> $log_time [ticket/13661] Wrong event @since version [ticket/13661] Removed superfluous whitespace [ticket/13661] bugfix: The conditional is the log_time, not log_type [ticket/13661] Fixed the "FROM" in the built query. [ticket/13661] Add event to allow editing the queries used to get the logs [ticket/13661] Transform queries to get logs and log count into built queries
| * | | | | | | | [ticket/13661] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| * | | | | | | | [ticket/13661] Brackets in their own linebrunoais2015-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't even notice that I used my own coding guidelines there... Thanks to MGaetan89 for pointing it out. PHPBB3-13661