aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympusJoas Schilling2014-03-111-9/+70
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11271: [ticket/11271] Make path conversion more precise [ticket/11271] Add docblock of feed_generate_content( ) [ticket/11271] Fix tabs and use !empty( ) instead of count( ) [ticket/11271] Remove unnecessary inclusion of functions_display [ticket/11271] Typecast forum and topic id to integer [ticket/11271] Use absolute path for displaying inline attachments in feeds [ticket/11271] Changed executable bit. [ticket/11271] Formatting code and removing null assignment. [ticket/11271] Removing unnecessary database object [ticket/11271] Separated attachment fetching query [ticket/11271] Fetched feed attachments before loop. [ticket/11271] Removed in-line attachment comments properly. [ticket/11271] Displaying in-line attached images in ATOM feed.
| * [ticket/11271] Make path conversion more preciseDhruv2013-12-271-1/+1
| | | | | | | | PHPBB3-11271
| * [ticket/11271] Add docblock of feed_generate_content( )Dhruv2013-12-271-0/+8
| | | | | | | | PHPBB3-11271
| * [ticket/11271] Fix tabs and use !empty( ) instead of count( )Dhruv2013-12-271-13/+13
| | | | | | | | PHPBB3-11271
| * [ticket/11271] Remove unnecessary inclusion of functions_displayDhruv2013-12-271-1/+0
| | | | | | | | PHPBB3-11271
| * [ticket/11271] Typecast forum and topic id to integerDhruv2013-12-271-2/+2
| | | | | | | | PHPBB3-11271
| * [ticket/11271] Use absolute path for displaying inline attachments in feedsDhruv2013-12-271-0/+3
| | | | | | | | PHPBB3-11271
| * [ticket/11271] Changed executable bit.erangamapa2013-12-271-0/+0
| | | | | | | | | | | | Changed executable bit value from 755 to 644. PHPBB3-11271
| * [ticket/11271] Formatting code and removing null assignment.erangamapa2013-12-271-5/+5
| | | | | | | | | | | | | | Formatted code and replaced null assignment with empty array assignment to attachments parameter in method 'feed_generate_content'. PHPBB3-11271
| * [ticket/11271] Removing unnecessary database objecterangamapa2013-12-271-1/+1
| | | | | | | | | | | | | | Removed unnecessary global database object from 'feed_generate_content' Method. PHPBB3-11271
| * [ticket/11271] Separated attachment fetching queryerangamapa2013-12-271-35/+44
| | | | | | | | | | | | | | | | Removed external query used to fetch related attachments. Added attachments fetching method with database query to post based feed. PHPBB3-11271
| * [ticket/11271] Fetched feed attachments before loop.erangamapa2013-12-271-16/+38
| | | | | | | | | | | | | | Fetched feed attachments before looping through feed items and send them to method 'feed_generate_content' for each feed item. PHPBB3-11271
| * [ticket/11271] Removed in-line attachment comments properly.erangamapa2013-12-271-1/+1
| | | | | | | | | | | | Added a new regex to remove in-line attachment comments. PHPBB3-11271
| * [ticket/11271] Displaying in-line attached images in ATOM feed.erangamapa2013-12-271-9/+29
| | | | | | | | | | | | | | | | | | In-line attached images are not displaying as they are not parsing. Included 'parse_attachments' column name for data fetching queries in feed.php. Checked weather feeds have in-line attachments and parsed them by using parse_attachments() method. PHPBB3-11271
* | Merge remote-tracking branch 'dhruvgoel92/ticket/11288' into develop-olympusJoas Schilling2014-03-111-0/+6
|\ \ | | | | | | | | | | | | * dhruvgoel92/ticket/11288: [ticket/11288] Handle +,- without preceeding whitespace characters
| * | [ticket/11288] Handle +,- without preceeding whitespace charactersDhruv2013-10-051-0/+6
| | | | | | | | | | | | PHPBB3-11288
* | | Merge remote-tracking branch 'EXreaction/ticket/12259-olympus' into ↵Joas Schilling2014-03-111-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * EXreaction/ticket/12259-olympus: [ticket/12259] Reduce the size of our test matrix
| * | | [ticket/12259] Reduce the size of our test matrixNathan Guse2014-03-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only test MariaDB or PostgreSQL once on PHP 5.4. This reduces our build matrix by 10 builds (over half). PHPBB3-12259
* | | | Merge pull request #2105 from Crizz0/ticket/12106Nathan Guse2014-03-101-1/+1
|\ \ \ \ | | | | | | | | | | [ticket/12106] Adds a explaination that admin/mods still able to use the...
| * | | | [ticket/12106] Combined first and second sentenceCrizzo2014-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12106
| * | | | [ticket/12106] Adds a explaination that admin/mods still able to use the boardCrizzo2014-03-101-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-12106
* | | | Merge pull request #2100 from Crizz0/ticket/10549Nathan Guse2014-03-102-3/+6
|\ \ \ \ | |/ / / |/| | | [ticket/10549] Adds language variables to Error messages MODULE...
| * | | [ticket/10549] Adds language variablesCrizzo2014-03-102-3/+6
|/ / / | | | | | | | | | PHPBB3-10549
* | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945' into ↵Nathan Guse2014-03-092-29/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/dhruvgoel92/ticket/10945: [ticket/10945] Fix return values for split_keywords function [ticket/10945] Display search query when search fails in native search [ticket/10945] remove trigger_error call
| * | | [ticket/10945] Fix return values for split_keywords functionDhruv2014-03-081-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The function now returns false if all the words are common words and true otherwise. PHPBB3-10945
| * | | [ticket/10945] Display search query when search fails in native searchDhruv2014-03-081-18/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If search fails and common words are present, split_keywords returns false and search.php file prints appropriate message of common words. If search fails and there are no common words, split_keywords returns true and keyword_search returns false so that the search query is displayed in search box. PHPBB3-10945
| * | | [ticket/10945] remove trigger_error callDhruv Goel2014-03-081-6/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | removes trigger_error call incase no search results are found or start variable exceeds the amount. So that search query is displayed in the search box even if no results are returned. PHPBB3-10945
* | | Merge remote-tracking branch 'bantu/ticket/11509' into develop-olympusJoas Schilling2014-03-012-5/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11509: [ticket/11509] Exit with the expected (non-zero) exit status on failure. [ticket/11509] Output which commit is being inspected. [ticket/11509] Three dots means sym. difference, but we only want new commits.
| * | | [ticket/11509] Exit with the expected (non-zero) exit status on failure.Andreas Fischer2014-02-211-3/+22
| | | | | | | | | | | | | | | | PHPBB3-11509
| * | | [ticket/11509] Output which commit is being inspected.Andreas Fischer2014-02-211-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11509
| * | | [ticket/11509] Three dots means sym. difference, but we only want new commits.Andreas Fischer2014-02-212-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11509
* | | | Merge pull request #2059 from nickvergessen/ticket/12205Nils Adermann2014-02-252-1/+43
|\ \ \ \ | | | | | | | | | | [ticket/12205] Do not display 0 for empty integers when show_novalue is off
| * | | | [ticket/12205] Do not display 0 for empty integers when show_novalue is offJoas Schilling2014-02-252-1/+43
|/ / / / | | | | | | | | | | | | PHPBB3-12205
* | | | Merge remote-tracking branch 'remotes/prototech/ticket/12093' into ↵Nathan Guse2014-02-193-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/prototech/ticket/12093: [ticket/12093] Check that document.selection is supported.
| * | | | [ticket/12093] Check that document.selection is supported.Cesar G2014-01-253-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12093
* | | | | Merge remote-tracking branch 'github-exreaction/ticket/12210' into ↵Nils Adermann2014-02-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-exreaction/ticket/12210: [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
| * | | | | [ticket/12210] dbtools::sql_create_table incorrectly throws errorNathaniel Guse2014-02-171-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | related to auto-increment length on non auto-increment fields PHPBB3-12210
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12188' into ↵Nils Adermann2014-02-131-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/12188: [ticket/12188] Add php 5.6 to travis enviroments
| * | | | [ticket/12188] Add php 5.6 to travis enviromentsJoas Schilling2014-02-131-0/+1
|/ / / / | | | | | | | | | | | | PHPBB3-12188
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12162' into ↵Nils Adermann2014-02-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/12162: [ticket/12162] Set language to C before running diff to ensure its english
| * | | | [ticket/12162] Set language to C before running diff to ensure its englishJoas Schilling2014-02-041-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-12162
* | | | Merge pull request #2001 from bantu/ticket/12161Nils Adermann2014-02-041-5/+5
|\ \ \ \ | | | | | | | | | | [ticket/12161] Do not use subdirectories in build/save directory.
| * | | | [ticket/12161] Do not use subdirectories in build/save directory.Andreas Fischer2014-02-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is pretty much pointless because a new build will wipe the save directory and there are only a few files in there anyway. PHPBB3-12161
* | | | | Merge pull request #1999 from bantu/ticket/11509Nils Adermann2014-02-041-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | [ticket/11509] Further improvements/fixes for the Travis CI commit message checker
| * | | | [ticket/11509] Be exact when referencing the branch name.Andreas Fischer2014-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11509
| * | | | [ticket/11509] Run commit message checker only in one environment.Andreas Fischer2014-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11509
| * | | | [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.Andreas Fischer2014-02-031-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-11509
* | | | Merge remote-tracking branch 'github-bantu/ticket/11509' into develop-olympusNils Adermann2014-02-032-0/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/11509: [ticket/11509] Fail on Travis CI if commit messages are improperly formatted.
| * | | | [ticket/11509] Fail on Travis CI if commit messages are improperly formatted.Andreas Fischer2014-02-022-0/+31
| | | | | | | | | | | | | | | | | | | | PHPBB3-11509
* | | | | Merge remote-tracking branch 'Crizz0/ticket/12146' into develop-olympusAndreas Fischer2014-02-021-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * Crizz0/ticket/12146: [ticket/12146] Added a missing # to inline css-style of <span>