aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10258] Change the DOCTYPE to HTML5Igor Wiedler2011-07-0926-143/+108
| | | | PHPBB3-10258
* 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
| | | * [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 'develop-olympus' into developNils Adermann2011-07-0616-18/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
| * | | 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 'develop-olympus' into developAndreas Fischer2011-07-061-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10247] Remove attempt_id as primary key from database_update.php
| * | | 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 'develop-olympus' into developAndreas Fischer2011-07-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
| * | | 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)
| | | * | [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)Nils Adermann2011-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attempt_id column was deleted PHPBB3-10247
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-0512-58/+42
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.9] Update Changelog for 3.0.9 release. [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater. [ticket/10247] Add a db_tools test for the removal of a primary key column. [ticket/10247] Add empty data section to database update for RC4 [ticket/10247] Remove unecessary attempt_id primary key column Conflicts: phpBB/install/database_update.php
| * | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-0512-58/+42
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [prep-release-3.0.9] Update Changelog for 3.0.9 release. [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater. [ticket/10247] Add a db_tools test for the removal of a primary key column. [ticket/10247] Add empty data section to database update for RC4 [ticket/10247] Remove unecessary attempt_id primary key column 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 release.Andreas Fischer2011-07-051-0/+2
| | | | |
| | * | | [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.Andreas Fischer2011-07-054-8/+8
| | | | |
| | * | | Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9Andreas Fischer2011-07-0510-56/+26
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/| | | | | | | | | | | | | * naderman/ticket/10247: [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater. [ticket/10247] Add a db_tools test for the removal of a primary key column. [ticket/10247] Add empty data section to database update for RC4 [ticket/10247] Remove unecessary attempt_id primary key column
| | | * [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.Nils Adermann2011-07-041-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure that this column (which was too small and unecessary) does not remain on 3.0.9-RCX installations and boards that were updated to a 3.0.9 RC, the 3.0.10-RC1 release must correctly drop the column after db_tools has been corrected and fully reviewed. The current version is not capable of dropping primary keys correctly on all supported DBMSs. PHPBB3-10247
| | | * [ticket/10247] Add a db_tools test for the removal of a primary key column.Nils Adermann2011-07-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous drop column test already deleted the primary key, so that one was replaced with an ordinary column. PHPBB3-10247
| | | * [ticket/10247] Add empty data section to database update for RC4Nils Adermann2011-07-031-0/+4
| | | | | | | | | | | | | | | | PHPBB3-10247
| | | * [ticket/10247] Remove unecessary attempt_id primary key columnNils Adermann2011-07-039-54/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | The database update drops any key of the same name (potential primary key) and afterwards the column. This does not work on some of the supported DBMS and needs further changes. PHPBB3-10247
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-260-0/+0
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [prep-release-3.0.9] Bump database version to RC3 too.
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-260-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [prep-release-3.0.9] Bump database version to RC3 too. Conflicts: phpBB/install/database_update.php
| | * [prep-release-3.0.9] Bump database version to RC3 too.Andreas Fischer2011-06-261-1/+1
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-262-4/+28
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release. [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-262-4/+28
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release. [prep-release-3.0.9] Bumping version number for 3.0.9-RC3. 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-RC3 release.Andreas Fischer2011-06-261-1/+25
| | |
| | * [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.Andreas Fischer2011-06-264-5/+11
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-261-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10233] IE Emulation fix breaks PM posting layout
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-261-1/+1
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.9: [ticket/10233] IE Emulation fix breaks PM posting layout
| | * Merge remote-tracking branch 'naderman/ticket/10233' into prep-release-3.0.9Andreas Fischer2011-06-261-1/+1
| | |\ | | | | | | | | | | | | | | | | * naderman/ticket/10233: [ticket/10233] IE Emulation fix breaks PM posting layout
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-15 14:31:53 +0000