aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12262] Also find vars array when it's defined in the trigger_event()Joas Schilling2014-03-111-8/+19
* Merge remote-tracking branch 'dhruvgoel92/ticket/11271-develop' into developJoas Schilling2014-03-1110-10/+78
|\
| * Merge branch 'ticket/11271' into ticket/11271-developDhruv2013-12-272-2/+7
| |\
| | * [ticket/11271] Make path conversion more preciseDhruv2013-12-271-1/+1
| * | [ticket/11271] limit absolute path conversion to attachment links onlyDhruv2013-12-271-4/+6
| * | Merge branch 'ticket/11271' into ticket/11271-developDhruv2013-12-272-13/+21
| |\ \ | | |/
| | * [ticket/11271] Add docblock of feed_generate_content( )Dhruv2013-12-271-0/+8
| | * [ticket/11271] Fix tabs and use !empty( ) instead of count( )Dhruv2013-12-271-13/+13
| | * [ticket/11271] Remove unnecessary inclusion of functions_displayDhruv2013-12-271-1/+0
| | * [ticket/11271] Typecast forum and topic id to integerDhruv2013-12-271-2/+2
| | * [ticket/11271] Use absolute path for displaying inline attachments in feedsDhruv2013-12-271-0/+3
| | * [ticket/11271] Changed executable bit.erangamapa2013-12-271-0/+0
| | * [ticket/11271] Formatting code and removing null assignment.erangamapa2013-12-271-5/+5
| | * [ticket/11271] Removing unnecessary database objecterangamapa2013-12-271-1/+1
| | * [ticket/11271] Separated attachment fetching queryerangamapa2013-12-271-35/+44
| | * [ticket/11271] Fetched feed attachments before loop.erangamapa2013-12-271-16/+38
| | * [ticket/11271] Removed in-line attachment comments properly.erangamapa2013-12-271-1/+1
| | * [ticket/11271] Displaying in-line attached images in ATOM feed.erangamapa2013-12-271-9/+29
| * | Merge branch 'develop' into ticket/11271-developDhruv2013-12-27602-5945/+13038
| |\ \
| * | | [ticket/11271] Add the inline images html to contentDhruv2013-12-251-0/+1
| * | | [ticket/11271] Use class variable $db instead of globalDhruv2013-12-251-6/+4
| * | | Merge branch 'ticket/11271' into ticket/11271-developDhruv2013-10-059-9/+63
| |\ \ \
| | * | | [ticket/11271] Typecast forum and topic id to integerDhruv2013-10-041-2/+2
| | * | | [ticket/11271] Use absolute path for displaying inline attachments in feedsDhruv2013-09-151-0/+3
| | * | | [ticket/11271] Changed executable bit.erangamapa2013-09-151-0/+0
| | * | | [ticket/11271] Formatting code and removing null assignment.erangamapa2013-09-151-5/+5
| | * | | [ticket/11271] Removing unnecessary database objecterangamapa2013-09-151-1/+1
| | * | | [ticket/11271] Separated attachment fetching queryerangamapa2013-09-151-35/+44
| | * | | [ticket/11271] Fetched feed attachments before loop.erangamapa2013-09-151-16/+38
| | * | | [ticket/11271] Removed in-line attachment comments properly.erangamapa2013-09-151-1/+1
| | * | | [ticket/11271] Displaying in-line attached images in ATOM feed.erangamapa2013-09-151-9/+29
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-110-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'dhruvgoel92/ticket/11288' into develop-olympusJoas Schilling2014-03-111-0/+6
| |\ \ \ \ \
| | * | | | | [ticket/11288] Handle +,- without preceeding whitespace charactersDhruv2013-10-051-0/+6
| | | |/ / / | | |/| | |
* | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11288-develop' into developJoas Schilling2014-03-112-0/+55
|\ \ \ \ \ \
| * | | | | | [ticket/11288] Add unit test cases for foo-bar like queriesDhruv2014-03-091-0/+49
| * | | | | | Merge branch 'ticket/11288' into ticket/11288-developDhruv2014-03-091-0/+6
| |\ \ \ \ \ \
| | * | | | | | [ticket/11288] Handle +,- without preceeding whitespace charactersDhruv2014-03-091-0/+6
* | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-111-2/+5
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'EXreaction/ticket/12259-olympus' into develop-o...Joas Schilling2014-03-111-2/+7
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/12259] Reduce the size of our test matrixNathan Guse2014-03-101-2/+7
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2014-03-101-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #2105 from Crizz0/ticket/12106Nathan Guse2014-03-101-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/12106] Combined first and second sentenceCrizzo2014-03-101-1/+1
| | * | | | | | | [ticket/12106] Adds a explaination that admin/mods still able to use the boardCrizzo2014-03-101-1/+1
| | |/ / / / / /
* | | | | | | | Merge branch 'develop-olympus' into developNathan Guse2014-03-102-3/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #2100 from Crizz0/ticket/10549Nathan Guse2014-03-102-3/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ticket/10549] Adds language variablesCrizzo2014-03-102-3/+6
| |/ / / / / /
* | | | | | | Merge pull request #2107 from VSEphpbb/ticket/12117Nathan Guse2014-03-102-0/+42
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12117] Select all fields instead of item_basic_dataMatt Friedman2014-03-101-3/+1