aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-238-19/+11
|\
| * Merge pull request #2783 from hanakin/ticket/12862Andreas Fischer2014-08-238-19/+11
| |\
| | * [ticket/12862] Remove remaining simple-wrap idMichael Miday2014-08-111-4/+0
| | * [ticket/12862] Resize popups consistentlyhanakin2014-07-306-14/+10
| | * [ticket/12862] Add Borderhanakin2014-07-291-1/+1
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-222-4/+7
|\ \ \ | |/ /
| * | Merge pull request #2899 from Skouat/ticket/13003Andreas Fischer2014-08-222-4/+7
| |\ \
| | * | [ticket/13003] Add missing language keysMario Skouat2014-08-212-4/+7
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #2900 from prototech/ticket/13004Andreas Fischer2014-08-211-1/+1
| |\ \ \
| | * | | [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.Cesar G2014-08-211-1/+1
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-211-12/+12
|\ \ \ \ | |/ / /
| * | | [ticket/12990] Use {$var} instead of ${var}Tristan Darricau2014-08-211-12/+12
| |/ /
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-214-19/+0
|\ \ \ | |/ /
| * | Merge pull request #2894 from Nicofuma/ticket/12999Andreas Fischer2014-08-214-19/+0
| |\ \
| | * | [ticket/12999] Remove @author tagsTristan Darricau2014-08-194-19/+0
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-2136-121/+234
|\ \ \ \ | |/ / /
| * | | Merge pull request #2885 from Nicofuma/ticket/12990Marc Alexander2014-08-2136-121/+234
| |\ \ \
| | * | | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-172-3/+3
| | * | | [ticket/12990] Fix unit testsTristan Darricau2014-08-171-4/+4
| | * | | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-1635-118/+231
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-211-0/+29
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2889 from rxu/ticket/12994Marc Alexander2014-08-211-0/+29
| |\ \ \ \
| | * | | | [ticket/12994] Add core event to viewtopic.php before sending vars to templaterxu2014-08-211-0/+29
| | | |/ / | | |/| |
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-201-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/12998] Fix use of $lang in mcp_warn.phpTristan Darricau2014-08-191-2/+2
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-191-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/12989] Remove unused "created_by.jpg"Louis77772014-08-191-0/+0
| |/ / /
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-171-2/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #2886 from Oyabun1/ticket/12984Andreas Fischer2014-08-171-2/+2
| |\ \ \
| | * | | [ticket/12984] Remove blank line when no forum description shownOyabun12014-08-171-2/+2
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-171-3/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2881 from rxu/ticket/12986Andreas Fischer2014-08-171-3/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/12986] Fix detection of common words in searchrxu2014-08-171-3/+2
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-162-2/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2872 from Nicofuma/ticket/12975Andreas Fischer2014-08-162-2/+12
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/12975] Fix the construction of phpbb\auth\provider\db for OauthTristan Darricau2014-08-122-2/+12
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-143-1/+8
|\ \ \ \ | |/ / /
| * | | Merge pull request #2876 from PayBas/ticket/12900Marc Alexander2014-08-143-1/+8
| |\ \ \
| | * | | [ticket/12900] Fix potential avatar size box overflowPayBas2014-08-133-1/+8
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developCesar G2014-08-134-3/+3
|\ \ \ \ | |/ / /
| * | | [ticket/12856] Remove images from assets/plupload/img/PayBas2014-08-133-0/+0
| * | | [ticket/12856] Copy plupload images to prosilver dirPayBas2014-08-134-3/+3
| |/ /
* | | [ticket/12974] Update nightly build version to 3.2.0-a1-devJoas Schilling2014-08-123-4/+4
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-126-37/+197
|\ \ \ | |/ /
| * | [prep-release-3.1.0-RC3] Update phpBB Version for RC4 developmentJoas Schilling2014-08-122-2/+2
| * | [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3Joas Schilling2014-08-111-0/+122
| * | [prep-release-3.1.0-RC3] Prepare ChangelogJoas Schilling2014-08-111-32/+35
| * | [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3Joas Schilling2014-08-111-0/+35
| * | [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3Joas Schilling2014-08-115-7/+7