aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/11549' into developDavid King2013-05-315-1/+193
|\ | | | | | | | | | | * 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] Add functional test for ACP Extension Module with TemplateJoas Schilling2013-05-314-0/+193
| | | | | | | | PHPBB3-11549
| * [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
* | | | Merge remote-tracking branch 'Elsensee/ticket/11570' into developJoas Schilling2013-05-311-1/+12
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | * Elsensee/ticket/11570: [ticket/11570] Fix link and make the notice more conspiciuous [ticket/11570] Add link back to update process
| * | [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 developAndreas Fischer2013-05-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11580] Enable prefer-source option (should error way less) [ticket/11580] Enable --no-interaction option on composer for travis Conflicts: .travis.yml
| * \ \ \ Merge remote-tracking branch 'nickvergessen/ticket/11580' into develop-olympusAndreas Fischer2013-05-281-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11580: [ticket/11580] Enable prefer-source option (should error way less) [ticket/11580] Enable --no-interaction option on composer for travis
| | * | | | [ticket/11580] Enable prefer-source option (should error way less)Joas Schilling2013-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11580
| | * | | | [ticket/11580] Enable --no-interaction option on composer for travisJoas Schilling2013-05-271-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | There is no interaction available on travis ;) PHPBB3-11580
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | * develop-olympus: [ticket/11578] Add missing underscore after 'validate' function prefix
| * | | Merge remote-tracking branch 'marc1706/ticket/11578' into develop-olympusJoas Schilling2013-05-271-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11578: [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 remote-tracking branch 'bantu/ticket/11573' into developJoas Schilling2013-05-272-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11573: [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in phpbb_user_loader_test. [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in test_style_select.
| * | | | [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in phpbb_user_loader_test.Andreas Fischer2013-05-271-0/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-11573
| * | | | [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in test_style_select.Andreas Fischer2013-05-271-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11573
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-0/+14
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.
| * | | | Merge remote-tracking branch 'bantu/ticket/11576' into develop-olympusJoas Schilling2013-05-271-0/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11576: [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.
| | * | | | [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.Andreas Fischer2013-05-271-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11576
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-270-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | * develop-olympus: [ticket/11575] Correct test_cross_join() to test_order_lower().
| * | | | Merge remote-tracking branch 'bantu/ticket/11575' into develop-olympusJoas Schilling2013-05-271-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * bantu/ticket/11575: [ticket/11575] Correct test_cross_join() to test_order_lower().
| | * | | [ticket/11575] Correct test_cross_join() to test_order_lower().Andreas Fischer2013-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test does not do any cross joining, it only tests ORDER BY LOWER(...). PHPBB3-11575
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-273-15/+126
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | * 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().
| * | | Merge remote-tracking branch 'remotes/bantu/ticket/11538' into develop-olympusJoas Schilling2013-05-273-15/+126
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * remotes/bantu/ticket/11538: [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] Cut functional tests down a bit as these are more expensive.Andreas Fischer2013-05-261-14/+4
| | | | | | | | | | | | | | | | PHPBB3-11538
| | * | [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.Andreas Fischer2013-05-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11538
| | * | [ticket/11538] Add unit tests for phpbb_validate_hex_colour().Andreas Fischer2013-05-261-0/+121
| |/ / | | | | | | | | | PHPBB3-11538
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-268-20/+153
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-268-7/+145
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Modify test colour valuesMarc Alexander2013-05-191-2/+3
| | | | | | | | | | | | | | | | PHPBB3-11538
| | * | [ticket/11538] Limit comment in acp_groups to 80 characters per lineMarc Alexander2013-05-191-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11538
| | * | [ticket/11538] Move group ID into abstract test class and add more test casesMarc Alexander2013-05-193-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The group ID is defined in the abstract class now and additional test cases for hex colour values have been added. 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
| | * | [ticket/11538] Use abstract class for functional test cases for group colourMarc Alexander2013-05-173-63/+60
| | | | | | | | | | | | | | | | PHPBB3-11538
| | * | Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-05-179-3/+235
| | |\ \ | | | | | | | | | | | | | | | 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-154-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will now make sure that 'AAFF00' will be matched but strings like 'AAFF00 AABB00' will not. PHPBB3-11538
| | * | | [ticket/11538] Add tests for acp group manage pageMarc Alexander2013-05-141-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will currently test if the colour check properly works. PHPBB3-11538
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 22:08:13 +0000