aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-05-121-1/+9
|\
| * [ticket/10820] fix regexDhruv2013-05-121-1/+9
* | Merge remote-tracking branch 'dhruvgoel92/ticket/10820' into ticket/10820-dev...Andreas Fischer2013-04-272-7/+19
|\ \ | |/
| * [ticket/10820] remove unnecessary parenthesesDhruv2013-04-271-1/+1
| * [ticket/10820] fix docblockDhruv2013-04-271-1/+1
| * [ticket/10820] add param and return to functionDhruv2013-04-271-3/+6
| * [ticket/10820] simplify regex and escape dotDhruv2013-04-271-1/+1
| * [ticket/10820] Use singular returnDhruv2013-04-271-1/+1
| * [ticket/10820] remove unnecessary condition checksDhruv2013-04-271-2/+2
| * [ticket/10820] add function docblockDhruv2013-04-271-0/+4
| * [ticket/10820] fix IE check functionDhruv2013-04-271-8/+8
| * [ticket/10820] proper usage of global and local variable browserDhruv2013-04-271-2/+2
| * [ticket/10820] Image downloader recognize new version of ieriadhchtara2013-04-271-9/+14
* | Merge PR #1371 branch 'EXreaction/ticket/11236' into developOleg Pudeyev2013-04-262-3/+3
|\ \
| * | [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN languageNathaniel Guse2013-04-251-1/+1
| * | [ticket/11236] Do not require group selection in prune usersNathaniel Guse2013-04-251-1/+1
| * | [ticket/11236] Correct HTMLNathaniel Guse2013-04-251-1/+1
* | | Merge PR #1370 branch 'EXreaction/ticket/11237' into developOleg Pudeyev2013-04-261-21/+15
|\ \ \
| * | | [ticket/11237] Fix PHP error in acp_prune.phpNathaniel Guse2013-04-251-21/+15
| |/ /
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11275' into developNathaniel Guse2013-04-252-39/+44
|\ \ \
| * | | [ticket/11275] Do not use spacer.gif in color pickerVjacheslav Trushkin2013-04-121-2/+2
| * | | [ticket/11275] Do not use document.write() for color paletteVjacheslav Trushkin2013-04-122-39/+44
* | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/4412' into developNathaniel Guse2013-04-252-0/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/4412] Shorten long profile fieldsVjacheslav Trushkin2013-04-112-0/+7
* | | | Merge pull request #1361 from MGaetan89/ticket/11471Nils Adermann2013-04-2520-54/+10
|\ \ \ \
| * | | | [ticket/11471] Unrelated text in e-mail templatesGaƫtan Muller2013-04-2420-54/+10
* | | | | Merge pull request #1368 from EXreaction/ticket/11479Nils Adermann2013-04-251-1/+7
|\ \ \ \ \
| * | | | | [ticket/11479] Use phpbb_create_default_containerNathan Guse2013-04-241-12/+1
| * | | | | [ticket/11479] Fix install/update (rebuild container)Nathaniel Guse2013-04-241-1/+18
| |/ / / /
* | | | | Merge pull request #1369 from EXreaction/ticket/11335Nils Adermann2013-04-2517-40/+40
|\ \ \ \ \
| * | | | | [ticket/11335] Replace "$phpEx" with $phpExNathaniel Guse2013-04-245-8/+8
| * | | | | [ticket/11335] (more) Make php_ext 'php' not '.php'Nathan Guse2013-04-241-1/+1
| * | | | | [ticket/11335] (more class loader) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-7/+7
| * | | | | [ticket/11335] (avatars) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-9/+9
| * | | | | [ticket/11335] (kernel request subscriber) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-4/+4
| * | | | | [ticket/11335] (hook finder) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-2/+2
| * | | | | [ticket/11335] (extension manager/finder) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-9/+9
| * | | | | [ticket/11335] (controller/helper.php) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-2/+2
| * | | | | [ticket/11335] (class loader) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-6/+6
* | | | | | Merge pull request #1367 from EXreaction/ticket/11454Nils Adermann2013-04-2513-22/+39
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/11454] Check if the fields are setNathaniel Guse2013-04-241-4/+4
| * | | | | [ticket/11454] Use set_addresses in other applicable areasNathan Guse2013-04-2410-20/+13
| * | | | | [ticket/11454] Add messenger function set_addressesNathaniel Guse2013-04-242-1/+19
| * | | | | [ticket/11454] Correct jabber global available checkNathaniel Guse2013-04-241-1/+7
| |/ / / /
* | | | | Merge pull request #1366 from asperous/ticket/11129Nils Adermann2013-04-241-2/+17
|\ \ \ \ \
| * | | | | [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-0/+1
| * | | | | [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-2/+16
| |/ / / /
* | | | | Merge remote-tracking branch 'github-asperous/ticket/9975' into developNils Adermann2013-04-246-5/+9
|\ \ \ \ \
| * | | | | [ticket/9975] Moved a few E_USER_ERROR errors to /languageasperous2013-04-237-6/+11
| |/ / / /
* | | | | Merge branch 'develop-olympus' into developNils Adermann2013-04-242-1/+2
|\ \ \ \ \