aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11577] Readjust min-height to 35pxMatt Friedman2013-06-291-1/+1
| | | | | | | Changing min-height to 35px in order to get pixel-for-pixel accurate height settings as before for topic-rows. PHPBB3-11577
* [ticket/11577] Correct over-sized Topic RowsMatt Friedman2013-05-281-1/+1
| | | | | | | | | | Fixes a change made in PR 1331 that oversized topic rows. Icons in topic rows, in Prosilver, are only 27px high, so we do not need a min-height as high as 40px. Setting it to 30px is more conservative and reclaims the original height of topic rows from before PR 1331. http://tracker.phpbb.com/browse/PHPBB3-11577 PHPBB3-11577
* 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
| | * | [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-145-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-1/+2
| | | | | | | | | | | | | | | | PHPBB3-11538
| | * | [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-143-42/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge remote-tracking branch 'Elsensee/ticket/11567' into developAndreas Fischer2013-05-261-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11567: [ticket/11567] Renamed extension_manager variable to avoid fatal error
| * | | | [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
| * | | | [ticket/11560] Fix jQuery link in installerVjacheslav Trushkin2013-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11560
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11435-2' into developDavid King2013-05-223-34/+78
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11435-2: [ticket/11435] Enable spacing test as it should now pass [ticket/11435] Create new template filter option (cleanup)
| * | | | [ticket/11435] Enable spacing test as it should now passNathan Guse2013-05-201-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11435
| * | | | [ticket/11435] Create new template filter option (cleanup)Nathan Guse2013-05-202-30/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to only run cleanup on the last run of template compilation and not cleanup during event parsing PHPBB3-11435
* | | | | Merge remote-tracking branch 'remotes/Senky/ticket/11010' into developNathaniel Guse2013-05-2165-199/+314
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Senky (19) and others # Via Senky * remotes/Senky/ticket/11010: (32 commits) [ticket/11010] properly tabifying 'max_autologin_time' [ticket/11010] resolving latest comments [ticket/11010] Fixes for number input in acp [ticket/11010] Fix input type for urls [ticket/11010] Fix email inputs [ticket/11010] updating tests [ticket/11010] dealing with dimensions problem, removing extra code [ticket/11010] Change input type to search for search forms [ticket/11010] Add all HTML5 input types to ACP [ticket/11010] Add HTML5 input types to installer [ticket/11010] validation to match type [ticket/11010] displaying min and max only if they are set [ticket/11010] fixing tests [ticket/11010] replacing maxlenght with max [ticket/11010] applying some of EXreaction notes [ticket/11010] Try to keep min < max. [ticket/11010] Mock user in order for the test to run standalone. [ticket/11010] Progress toward fixing the test suite. [ticket/11010] adding type="url" to 'site_home_url' [ticket/11010] fixing inputs types in memberlist_search.html ...
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 21:59:31 +0000