aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-rxu/ticket/10226' into develop-olympusNils Adermann2011-07-161-1/+17
|\ | | | | | | | | | | * github-rxu/ticket/10226: [ticket/10226] Use is_numeric() instead of preg_replace() [ticket/10226] Allow mysqli connections via local sockets/pipes
| * [ticket/10226] Use is_numeric() instead of preg_replace()rxu2011-06-211-1/+1
| | | | | | | | PHPBB3-10226
| * [ticket/10226] Allow mysqli connections via local sockets/pipesrxu2011-06-211-1/+17
| | | | | | | | PHPBB3-10226
* | Merge remote-tracking branch 'github-nickvergessen/ticket/10252' into ↵Nils Adermann2011-07-161-0/+8
|\ \ | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10252: [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permission
| * | [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permissionJoas Schilling2011-07-151-0/+8
| | | | | | | | | | | | | | | | | | Be careful when using this function with permissions a_, m_, u_ and f_ ! It may not work correctly. When a user group grants an a_* permission, e.g. a_foo, but the user's a_foo permission is set to "Never", then the user does not in fact have the a_ permission. But the user will still be listed as having the a_ permission. PHPBB3-10252
* | | Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympusNils Adermann2011-07-165-3/+73
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10243: [ticket/10243] Adding a few unit tests for phpbb_gmgetdate(). [ticket/10243] Call phpbb_gmgetdate() from various places. [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
| * | | [ticket/10243] Adding a few unit tests for phpbb_gmgetdate().Andreas Fischer2011-07-131-0/+49
| | | | | | | | | | | | | | | | PHPBB3-10243
| * | | [ticket/10243] Call phpbb_gmgetdate() from various places.Andreas Fischer2011-07-133-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10243
| * | | [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.Andreas Fischer2011-07-121-0/+21
| | | | | | | | | | | | | | | | PHPBB3-10243
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10237' into ↵Nils Adermann2011-07-164-25/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10237: [ticket/10237] Also display login-box on subscribing [ticket/10237] Handle watching and unwatching the same way. [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
| * | | | [ticket/10237] Also display login-box on subscribingJoas Schilling2011-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10237
| * | | | [ticket/10237] Handle watching and unwatching the same way.Joas Schilling2011-07-114-18/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add some information to the confirm-box (forum_name / topic title) PHPBB3-10237
| * | | | [ticket/10237] Use confirm-box to handle unwatching a forum/topic actionsJoas Schilling2011-07-072-9/+23
| | | | | | | | | | | | | | | | | | | | PHPBB3-10237
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/7291' into ↵Nils Adermann2011-07-163-37/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/7291: [ticket/7291] Use template loop for character list, to avoid double &first_char
| * | | | | [ticket/7291] Use template loop for character list, to avoid double &first_charJoas Schilling2011-07-143-37/+37
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-7291
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/5506' into ↵Nils Adermann2011-07-166-22/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/5506: [ticket/5506] Do not display an empty last page after deleting logs.
| * | | | | [ticket/5506] Do not display an empty last page after deleting logs.Joas Schilling2011-07-146-22/+39
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | The fix is copied from view_inactive_users(). Also add keywords and sort parameters to url for deleting logs and inactive users. And finally save some queries if there are no logs/users to display anyway
* | | | | Merge remote-tracking branch 'github-bantu/ticket/10208' into develop-olympusNils Adermann2011-07-151-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * github-bantu/ticket/10208: [ticket/10208] Explain what happens when 'Warning duration' is set to 0.
| * | | | [ticket/10208] Explain what happens when 'Warning duration' is set to 0.Tabitha Backoff2011-07-161-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-10208
* | | | Merge remote branch 'remotes/callumacrae/ticket/10216' into develop-olympusJoas Schilling2011-07-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * remotes/callumacrae/ticket/10216: [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.
| * | | | [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.Callum Macrae2011-07-141-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Previously "errors are listing below", should have said "errors are listed below". PHPBB3-10216
* | | | Merge remote branch 'remotes/bantu/ticket/10267' into develop-olympusJoas Schilling2011-07-141-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * remotes/bantu/ticket/10267: [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.
| * | | | [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.Andreas Fischer2011-07-141-2/+2
| |/ / / | | | | | | | | | | | | PHPBB3-10267
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10255' into develop-olympusAndreas Fischer2011-07-141-11/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * nickvergessen/ticket/10255: [ticket/10255] Add leading slash in gitignore to only ignore specified files
| * | | [ticket/10255] Add leading slash in gitignore to only ignore specified filesJoas Schilling2011-07-141-11/+11
|/ / / | | | | | | | | | PHPBB3-10255
* | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-102-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [prep-release-3.0.9] Bumping version number for 3.0.9 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | | [prep-release-3.0.9] Bumping version number for 3.0.9 final.Andreas Fischer2011-07-104-5/+11
| | | |
* | | | Merge remote-tracking branch 'p/ticket/10003' into develop-olympusAndreas Fischer2011-07-091-2242/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10003: [ticket/10003] Fixed comment referring to db_tools duplication. [ticket/10003] Require db_tools.php in database_update.php. [ticket/10003] Use phpbb_db_tools in database_update.php. [ticket/10003] Delete the copy of db_tools in database_update.php.
| * | | | [ticket/10003] Fixed comment referring to db_tools duplication.Oleg Pudeyev2011-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10003
| * | | | [ticket/10003] Require db_tools.php in database_update.php.Oleg Pudeyev2011-07-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use require_updated to use the new version of db_tools if one is present. PHPBB3-10003
| * | | | [ticket/10003] Use phpbb_db_tools in database_update.php.Oleg Pudeyev2011-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the copy of db tools has been deleted, change which class name is used. PHPBB3-10003
| * | | | [ticket/10003] Delete the copy of db_tools in database_update.php.Oleg Pudeyev2011-07-091-2239/+0
|/ / / / | | | | | | | | | | | | PHPBB3-10003
* | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-073-3/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release. [prep-release-3.0.9] Decreasing version for an RC4 release. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | | [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.Andreas Fischer2011-07-071-0/+2
| | | |
| * | | [prep-release-3.0.9] Decreasing version for an RC4 release.Andreas Fischer2011-07-074-6/+6
| | | |
* | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-073-1/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10250] The site_logo hash is different depending on imageset & language [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
| * | | Merge remote-tracking branch 'naderman/ticket/10250' into prep-release-3.0.9Andreas Fischer2011-07-073-1/+37
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10250: [ticket/10250] The site_logo hash is different depending on imageset & language [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
| | * | | [ticket/10250] The site_logo hash is different depending on imageset & languageNils Adermann2011-07-061-4/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-10250
| | * | | [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imagesetNils Adermann2011-07-051-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10250
| | * | | [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is usedNils Adermann2011-07-051-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new logo is slightly wider than the old logo. If we changed the size in the imageset.cfg we would cause a conflict for everyone who replaced the logo with their own and modified the size. Instead we overwrite the width and height in the img() function in session.php only if its contents are that of the stock phpbb logo. PHPBB3-10250
| | * | | [ticket/10250] Added the new phpBB Logo with the Registered Trademark SymbolSam Thompson2011-07-051-0/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10250
* | | | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-07-0616-18/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
| * | | | Merge branch 'ticket/marshalrusty/9859' into prep-release-3.0.9Nils Adermann2011-07-0616-18/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/marshalrusty/9859: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
| | * | | | [ticket/9859] Changing all phpBB footers to match the new credit lineYuriy Rusko2011-07-0615-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9859
| | * | | | [ticket/9859] New footer copyright line with registered symbolYuriy Rusko2011-07-061-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9859
* | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-061-1/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * prep-release-3.0.9: [ticket/10247] Remove attempt_id as primary key from database_update.php
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10247' into ↵Andreas Fischer2011-07-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.9 * nickvergessen/ticket/10247: [ticket/10247] Remove attempt_id as primary key from database_update.php
| | * | | [ticket/10247] Remove attempt_id as primary key from database_update.phpJoas Schilling2011-07-051-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-10247
* | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
| * | | Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9Andreas Fischer2011-07-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10247: [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)