aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developDhruv2013-06-052-3/+10
|\ | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Dhruv (1) * develop-olympus: [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. Conflicts: phpBB/includes/search/fulltext_mysql.php phpBB/language/en/acp/search.php
| * Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympusDhruv2013-06-052-3/+10
| |\ | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11583: [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
| | * [ticket/11583] Use a new lang key instead of giving the old one a new meaning.Andreas Fischer2013-06-032-2/+2
| | | | | | | | | | | | PHPBB3-11583
| | * [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.Andreas Fischer2013-06-012-2/+9
| | | | | | | | | | | | PHPBB3-11583
* | | [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.Andreas Fischer2013-06-031-3/+3
| | | | | | | | | | | | PHPBB3-11586
* | | [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.Andreas Fischer2013-06-031-8/+1
| | | | | | | | | | | | PHPBB3-11586
* | | [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.Andreas Fischer2013-06-031-8/+8
| | | | | | | | | | | | PHPBB3-11586
* | | [ticket/11586] Combine administrator/moderator checks together.Andreas Fischer2013-06-031-7/+7
| | | | | | | | | | | | PHPBB3-11586
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-10/+10
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/11145] Wrong error thrown when uploading a bigger image.
| * | Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympusAndreas Fischer2013-06-031-10/+10
| |\ \ | | | | | | | | | | | | | | | | * erangamapa/ticket/11145: [ticket/11145] Wrong error thrown when uploading a bigger image.
| | * | [ticket/11145] Wrong error thrown when uploading a bigger image.erangamapa2013-05-251-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When attaching an image to a post with a size larger than maximum defined in php.ini, 'ATTACHED_IMAGE_NOT_IMAGE' error is thrown. $file->is_image() is returning false value when image size is too large. Therefore, moved not image test down after image size test. PHPBB3-11145
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-0/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10840] Add check_form_key to acp_groups.php
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10840' into develop-olympusAndreas Fischer2013-06-031-0/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10840: [ticket/10840] Add check_form_key to acp_groups.php
| | * | | [ticket/10840] Add check_form_key to acp_groups.phpJoas Schilling2013-06-031-0/+10
| | | |/ | | |/| | | | | | | | | PHPBB3-10840
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-2/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11122] Add dhruv to active authors [ticket/11122] Remove Oleg and igorw from active authors
| * | | [ticket/11122] Add dhruv to active authorsJoas Schilling2013-06-031-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11122
| * | | [ticket/11122] Remove Oleg and igorw from active authorsJoas Schilling2013-06-031-2/+2
| |/ / | | | | | | | | | PHPBB3-11122
* | | Merge remote-tracking branch 'nickvergessen/ticket/11549' into developDavid King2013-05-311-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11549: [ticket/11549] Add functional test for ACP Extension Module with Template [ticket/11549] Do not set extension dir path for style in adm/index.php
| * | | [ticket/11549] Do not set extension dir path for style in adm/index.phpJoas Schilling2013-05-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As we don't want style files in adm/adm/style/ we should not prepend the adm/ by setting it. Note, we did that correctly in adm/swatch.php. PHPBB3-11549
* | | | Merge remote-tracking branch 'Elsensee/ticket/11409' into developJoas Schilling2013-05-311-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11409: [ticket/11409] Add success message after updating group position settings
| * | | | [ticket/11409] Add success message after updating group position settingsOliver Schramm2013-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11409
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11387' into developJoas Schilling2013-05-311-3/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * EXreaction/ticket/11387: [ticket/11387] Log module added only after it has been added
| * | | | [ticket/11387] Log module added only after it has been addedNathaniel Guse2013-03-021-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11387
* | | | | [ticket/11570] Fix link and make the notice more conspiciuousOliver Schramm2013-05-311-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11570
* | | | | [ticket/11570] Add link back to update processOliver Schramm2013-05-301-1/+12
| |/ / / |/| | | | | | | | | | | PHPBB3-11570
* | | | Merge remote-tracking branch 'Elsensee/ticket/11569' into developJoas Schilling2013-05-291-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11569: [ticket/11569] Add type parameter and fix language variable [ticket/11569] Add parameter to URL and remove comment [ticket/11569] Fixing link to continue update
| * | | | [ticket/11569] Add type parameter and fix language variableOliver Schramm2013-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11569
| * | | | [ticket/11569] Add parameter to URL and remove commentOliver Schramm2013-05-291-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11569
| * | | | [ticket/11569] Fixing link to continue updateOliver Schramm2013-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11569
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/encryptedmind/11516' into ↵Andreas Fischer2013-05-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * nickvergessen/ticket/encryptedmind/11516: [ticket/11516] Upgrading the .live jquery function because it is deprecated.
| * | | | | [ticket/11516] Upgrading the .live jquery function because it is deprecated.Jesús Rafael Cova Huerta2013-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I changed the .live function of jQuery for .on function because a user reported that he had an error because of that, it showed that .live function was deprecated, so I changed for .on that it's same but it work with new jQuery versions. PHPBB3-11516
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | * develop-olympus: [ticket/11578] Add missing underscore after 'validate' function prefix
| * | | | [ticket/11578] Add missing underscore after 'validate' function prefixmarc17062013-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The underscore after the 'validate' function prefix for the older functions was dropped by accident in PR #1407. This patch will add it back. PHPBB3-11578
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | * develop-olympus: [ticket/11538] Cut functional tests down a bit as these are more expensive. [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass. [ticket/11538] Add unit tests for phpbb_validate_hex_colour().
| * | | [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.Andreas Fischer2013-05-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11538
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-265-20/+50
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11538] Add optional switch as argument to hex colour validation [ticket/11538] Modify test colour values [ticket/11538] Limit comment in acp_groups to 80 characters per line [ticket/11538] Move group ID into abstract test class and add more test cases [ticket/11538] Merge calls to validate_data() in acp_groups [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour [ticket/11538] Use abstract class for functional test cases for group colour [ticket/11538] Add function phpbb_validate_colour for validating colours [ticket/11538] Make sure regex doesn't allow multiple color values [ticket/11538] Add tests for acp group manage page [ticket/11538] Simplify colour value check and remove support for '#' [ticket/11538] Fix incorrect regex and test for duplicate # in color string [ticket/11538] Use regex for testing color value and improve tests [ticket/11538] Make sure group color can't exceed maximum of 6 characters Conflicts: phpBB/includes/functions_user.php phpBB/styles/prosilver/template/ucp_groups_manage.html
| * | | Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympusAndreas Fischer2013-05-265-7/+48
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11538: [ticket/11538] Add optional switch as argument to hex colour validation [ticket/11538] Modify test colour values [ticket/11538] Limit comment in acp_groups to 80 characters per line [ticket/11538] Move group ID into abstract test class and add more test cases [ticket/11538] Merge calls to validate_data() in acp_groups [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour [ticket/11538] Use abstract class for functional test cases for group colour [ticket/11538] Add function phpbb_validate_colour for validating colours [ticket/11538] Make sure regex doesn't allow multiple color values [ticket/11538] Add tests for acp group manage page [ticket/11538] Simplify colour value check and remove support for '#' [ticket/11538] Fix incorrect regex and test for duplicate # in color string [ticket/11538] Use regex for testing color value and improve tests [ticket/11538] Make sure group color can't exceed maximum of 6 characters
| | * | | [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-193-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value of $optional will decide whether an empty string will be treated as incorrect input or if it is allowed. The optional argument will default to false and therefore treat an empty string as incorrect unless explicitly told to not do so. PHPBB3-11538
| | * | | [ticket/11538] Limit comment in acp_groups to 80 characters per lineMarc Alexander2013-05-191-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11538
| | * | | [ticket/11538] Merge calls to validate_data() in acp_groupsMarc Alexander2013-05-191-11/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-11538
| | * | | [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colourMarc Alexander2013-05-193-4/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11538
| | * | | Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-05-172-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | ticket/11538
| | * | | | [ticket/11538] Add function phpbb_validate_colour for validating coloursMarc Alexander2013-05-163-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will be possible to use this function via the validate_data() function interface that has already been used previously. Thus, this new function will extend the capabilities of validate_data() to checking hex color values. PHPBB3-11538
| | * | | | [ticket/11538] Make sure regex doesn't allow multiple color valuesMarc Alexander2013-05-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will now make sure that 'AAFF00' will be matched but strings like 'AAFF00 AABB00' will not. PHPBB3-11538
| | * | | | [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-144-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input length for the hex color is now limited to 6 characters and the support for colors starting with a '#' has been dropped. The allowed input length of 7 in prosilver seems to have been a relict from old ages of phpBB3. In order to have proper support for correct checking of the colour value, the new code was also ported to the ACP groups manage page. The tests have been modified to reflect the changes to the behavior of the color check. Tests for the ACP will follow. PHPBB3-11538
| | * | | | [ticket/11538] Fix incorrect regex and test for duplicate # in color stringMarc Alexander2013-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11538
| | * | | | [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-142-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are now using a regex with preg_match() in order to properly check if the entered color value is in hex color format or not. A proper error message is triggered if an incorrect color value is entered and the prepended '#' is removed if necessary. PHPBB3-11538
| | * | | | [ticket/11538] Make sure group color can't exceed maximum of 6 charactersMarc Alexander2013-05-141-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to prevent future issues with this, a basic set of functional tests for the UCP groups manage page have been added. PHPBB3-11538
* | | | | | [ticket/11567] Renamed extension_manager variable to avoid fatal errorOliver Schramm2013-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11567
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/11560' into developAndreas Fischer2013-05-241-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11560: [ticket/11560] Fix jQuery link in installer
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-16 09:59:34 +0000