aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | [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-165-3/+73
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympusNils Adermann2011-07-165-3/+73
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/10243] Adding a few unit tests for phpbb_gmgetdate().Andreas Fischer2011-07-131-0/+49
| | * | | | | | | | | [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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10208' into develop-olympusNils 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
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-07-141-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote branch 'remotes/bantu/ticket/10267' into develop-olympusJoas Schilling2011-07-141-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.Andreas Fischer2011-07-141-2/+2
| | |/ / / / / /
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-141-12/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10255' into develop-olympusAndreas Fischer2011-07-141-11/+11
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ticket/10255] Add leading slash in gitignore to only ignore specified filesJoas Schilling2011-07-141-11/+11
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'igorw/ticket/7090' into developAndreas Fischer2011-07-137-13/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ticket/7090] Update documented minimum PHP version to 5.2.0Igor Wiedler2011-07-137-13/+12
|/ / / / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-102-2/+8
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-102-2/+8
| |\ \ \ \
| | * | | | [prep-release-3.0.9] Bumping version number for 3.0.9 final.Andreas Fischer2011-07-104-5/+11
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-091-2242/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'p/ticket/10003' into develop-olympusAndreas Fischer2011-07-091-2242/+5
| |\ \ \ \ \
| | * | | | | [ticket/10003] Fixed comment referring to db_tools duplication.Oleg Pudeyev2011-07-091-2/+2
| | * | | | | [ticket/10003] Require db_tools.php in database_update.php.Oleg Pudeyev2011-07-091-0/+2
| | * | | | | [ticket/10003] Use phpbb_db_tools in database_update.php.Oleg Pudeyev2011-07-091-1/+1
| | * | | | | [ticket/10003] Delete the copy of db_tools in database_update.php.Oleg Pudeyev2011-07-091-2239/+0
| |/ / / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-073-3/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-073-3/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.Andreas Fischer2011-07-071-0/+2