aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-07-165-3/+73
|\ | | | | | | | | | | | | * develop-olympus: [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.
| * 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 branch 'develop-olympus' into developNils Adermann2011-07-164-26/+68
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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 Conflicts: phpBB/includes/functions_display.php
| * | 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 branch 'develop-olympus' into developNils Adermann2011-07-163-37/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/7291] Use template loop for character list, to avoid double &first_char
| * | | 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 branch 'develop-olympus' into developNils Adermann2011-07-166-22/+39
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/5506] Do not display an empty last page after deleting logs.
| * | | | 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 branch 'develop-olympus' into developNils Adermann2011-07-151-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10208] Explain what happens when 'Warning duration' is set to 0.
| * | | | 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-tracking branch 'igorw/ticket/10260' into developAndreas Fischer2011-07-161-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10260: [ticket/10260] Remove the icon_fontsize.gif image (thanks Vinny)
| * | | | [ticket/10260] Remove the icon_fontsize.gif image (thanks Vinny)Igor Wiedler2011-07-151-0/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10260
* | | | | Merge branch 'ticket/igorw/10260' into developNils Adermann2011-07-159-231/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * ticket/igorw/10260: [ticket/10260] Remove prosilver styleswitcher
| * | | | [ticket/10260] Remove prosilver styleswitcherIgor Wiedler2011-07-129-231/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The styleswitcher is an odd invention that allows setting the font size of the page dynamically via JavaScript (and CSS). This should be done by browser settings instead. PHPBB3-10260
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-07-141-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.
| * | | | 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 branch 'develop-olympus' into developJoas Schilling2011-07-141-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.
| * | | | 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 branch 'develop-olympus' into developAndreas Fischer2011-07-141-12/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10255] Add leading slash in gitignore to only ignore specified files Conflicts: .gitignore
| * | | | 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 remote-tracking branch 'igorw/ticket/7090' into developAndreas Fischer2011-07-137-13/+12
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * igorw/ticket/7090: [ticket/7090] Update documented minimum PHP version to 5.2.0
| * | | [ticket/7090] Update documented minimum PHP version to 5.2.0Igor Wiedler2011-07-137-13/+12
|/ / / | | | | | | | | | PHPBB3-7090
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-102-2/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.9] Bumping version number for 3.0.9 final. Conflicts: phpBB/install/database_update.php
| * | 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 branch 'develop-olympus' into developAndreas Fischer2011-07-091-2242/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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. Conflicts: phpBB/install/database_update.php
| * | | 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 'develop-olympus' into developAndreas Fischer2011-07-073-3/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release. [prep-release-3.0.9] Decreasing version for an RC4 release.
| * | | 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 'develop-olympus' into developAndreas Fischer2011-07-073-1/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-27 11:24:12 +0000