aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2113 from nickvergessen/ticket/8041Andreas Fischer2014-03-138-10/+13
|\
| * [ticket/8041] Add space/tabs after => in array listJoas Schilling2014-03-131-3/+3
| * [ticket/8041] Wrap forum name, topic title and pm folder name with quotesJoas Schilling2014-03-122-2/+2
| * [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-129-9/+12
* | Merge branch 'develop-olympus' into developJoas Schilling2014-03-132-2/+8
|\ \
| * \ Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympusJoas Schilling2014-03-132-2/+8
| |\ \
| | * | [ticket/12176] Display correct message when trying to delete founder.Andreas Fischer2014-02-152-2/+8
* | | | Merge pull request #2104 from nickvergessen/ticket/12261Nathan Guse2014-03-121-2/+8
|\ \ \ \
| * | | | [ticket/12261] Add a functional test for redirect after using login_box()Joas Schilling2014-03-101-3/+1
| * | | | [ticket/12261] Remove web root path from login redirect urlJoas Schilling2014-03-101-2/+10
* | | | | Merge remote-tracking branch 'vsephpbb/ticket/12244' into developJoas Schilling2014-03-121-1/+1
|\ \ \ \ \
| * | | | | [ticket/12244] Rename extensions manager tabMatt Friedman2014-03-111-1/+1
| * | | | | [ticket/12244] Rename link to Extensions Manager in the ACPMatt Friedman2014-03-031-1/+1
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11716' into developJoas Schilling2014-03-122-0/+190
|\ \ \ \ \ \
| * | | | | | [ticket/11716] Correct license URLNathan Guse2014-03-112-2/+2
| * | | | | | [ticket/11716] Fix dependencies in migration filesNathan Guse2014-03-112-2/+2
| * | | | | | [ticket/11716] Rename migration files and add note that it's converting a MODNathan Guse2014-02-032-2/+6
| * | | | | | [ticket/11716] Convert Soft Delete Mod to post/topic visibilityNathan Guse2014-02-032-0/+186
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-03-122-2/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | [ticket/10549] using correct variable in includes/functions_module.php tooCrizzo2014-03-111-1/+1
| * | | | | [ticket/10549] changed "right" to "incorrect"Crizzo2014-03-111-1/+1
| * | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympusJoas Schilling2014-03-111-9/+70
| |\ \ \ \ \
| * \ \ \ \ \ 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 'rxu3/ticket/12260' into developJoas Schilling2014-03-111-8/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/12260] Add core events to delete_posts() function.rxu2014-03-111-8/+59
* | | | | | | | | 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-27496-5397/+11125
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | [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