aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-07-163-9/+16
|\
| * Merge remote-tracking branch 'github-nickvergessen/ticket/6632' into develop-...Nils Adermann2011-07-163-9/+15
| |\
| | * [ticket/6632] Better viewing of topics for wide screen displaysJoas Schilling2011-07-143-9/+15
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-1/+10
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-bantu/ticket/10257' into develop-olympusNils Adermann2011-07-161-1/+10
| |\ \
| | * | [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.Andreas Fischer2011-07-131-1/+4
| | * | [ticket/10257] Fix AAAA record parsing for old versions of WindowsPatrick Webster2011-07-131-1/+6
| | * | [ticket/10257] Add missing break statement after CNAME block.Andreas Fischer2011-07-131-0/+1
| | |/
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-1/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-bantu/ticket/10274' into develop-olympusNils Adermann2011-07-161-1/+1
| |\ \
| | * | [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_mainAndreas Fischer2011-07-151-1/+1
| | |/
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-0/+7
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-nickvergessen/ticket/10266' into develop...Nils Adermann2011-07-161-0/+7
| |\ \
| | * | [ticket/10266] Add "Return to forum" link after reporting a postJoas Schilling2011-07-141-0/+7
| | |/
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-163-9/+31
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-bantu/ticket/10263' into develop-olympusNils Adermann2011-07-163-9/+31
| |\ \
| | * | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.phpAndreas Fischer2011-07-141-4/+1
| | * | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.phpAndreas Fischer2011-07-141-5/+2
| | * | [ticket/10263] Add wrapper for version_compare() that allows the use of A and BAndreas Fischer2011-07-131-0/+28
| | |/
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-1/+17
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-rxu/ticket/10226' into develop-olympusNils Adermann2011-07-161-1/+17
| |\ \
| | * | [ticket/10226] Use is_numeric() instead of preg_replace()rxu2011-06-211-1/+1
| | * | [ticket/10226] Allow mysqli connections via local sockets/pipesrxu2011-06-211-1/+17
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-0/+8
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-nickvergessen/ticket/10252' into develop...Nils Adermann2011-07-161-0/+8
| |\ \ \
| | * | | [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permissionJoas Schilling2011-07-151-0/+8
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-164-3/+24
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympusNils Adermann2011-07-164-3/+24
| |\ \ \ \
| | * | | | [ticket/10243] Call phpbb_gmgetdate() from various places.Andreas Fischer2011-07-133-3/+3
| | * | | | [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.Andreas Fischer2011-07-121-0/+21
| | | |_|/ | | |/| |
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-164-26/+68
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10237' into develop...Nils Adermann2011-07-164-25/+67
| |\ \ \ \
| | * | | | [ticket/10237] Also display login-box on subscribingJoas Schilling2011-07-111-1/+1
| | * | | | [ticket/10237] Handle watching and unwatching the same way.Joas Schilling2011-07-114-18/+46
| | * | | | [ticket/10237] Use confirm-box to handle unwatching a forum/topic actionsJoas Schilling2011-07-072-9/+23
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-163-37/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/7291' into develop-...Nils Adermann2011-07-163-37/+37
| |\ \ \ \ \
| | * | | | | [ticket/7291] Use template loop for character list, to avoid double &first_charJoas Schilling2011-07-143-37/+37
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-166-22/+39
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/5506' into develop-...Nils Adermann2011-07-166-22/+39
| |\ \ \ \ \
| | * | | | | [ticket/5506] Do not display an empty last page after deleting logs.Joas Schilling2011-07-146-22/+39
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-151-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/10208] Explain what happens when 'Warning duration' is set to 0.Tabitha Backoff2011-07-161-1/+1
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'igorw/ticket/10260' into developAndreas Fischer2011-07-161-0/+0
|\ \ \ \ \
| * | | | | [ticket/10260] Remove the icon_fontsize.gif image (thanks Vinny)Igor Wiedler2011-07-151-0/+0
* | | | | | Merge branch 'ticket/igorw/10260' into developNils Adermann2011-07-159-231/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/10260] Remove prosilver styleswitcherIgor Wiedler2011-07-129-231/+2
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-07-141-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote branch 'remotes/callumacrae/ticket/10216' into develop-olympusJoas Schilling2011-07-141-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.Callum Macrae2011-07-141-1/+1
| | | |/ / / | | |/| | |