aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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 ...
| * | | | | [ticket/11010] properly tabifying 'max_autologin_time'Senky2013-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] resolving latest commentsSenky2013-05-213-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] Fixes for number input in acpVjacheslav Trushkin2013-05-2019-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] Fix input type for urlsVjacheslav Trushkin2013-05-204-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] Fix email inputsVjacheslav Trushkin2013-05-205-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add type="email" to fields that should be email fields Change back to type="text" fields that might have wildcards or not necessary email PHPBB3-11010
| * | | | | [ticket/11010] updating testsSenky2013-05-202-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] dealing with dimensions problem, removing extra codeSenky2013-05-204-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] Change input type to search for search formsVjacheslav Trushkin2013-05-209-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change input type to search for search forms Replace search placeholder JS with placeholder attribute Add style for search placeholder PHPBB3-11010
| * | | | | [ticket/11010] Add all HTML5 input types to ACPVjacheslav Trushkin2013-05-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all new HTML5 input types to functions_acp.php, handle them as text for now PHPBB3-11010
| * | | | | [ticket/11010] Add HTML5 input types to installerVjacheslav Trushkin2013-05-201-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new HTML5 input types to installer PHPBB3-11010
| * | | | | [ticket/11010] validation to match typeSenky2013-05-202-48/+48
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] displaying min and max only if they are setSenky2013-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] fixing testsSenky2013-05-201-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] replacing maxlenght with maxSenky2013-05-203-62/+64
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] applying some of EXreaction notesSenky2013-05-209-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] Try to keep min < max.Oleg Pudeyev2013-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] Mock user in order for the test to run standalone.Oleg Pudeyev2013-05-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] Progress toward fixing the test suite.Oleg Pudeyev2013-05-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] adding type="url" to 'site_home_url'Senky2013-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] fixing inputs types in memberlist_search.htmlSenky2013-05-202-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] adding type="number" to subsilver2Senky2013-05-208-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and removing it from prosilver wher it should not be. PHPBB3-11010
| * | | | | [ticket/11010] adding type="number" and type="date" to prosilverSenky2013-05-206-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] adding type="number" to inputs in functions_profile_fields.phpSenky2013-05-201-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] adding type="number" to CPF int typeSenky2013-05-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] fixing problems with 4th parameter in number typeSenky2013-05-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] Changing email and url types in adm templatesVinny2013-05-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] yahoo and msn user search fields changed to email input typeVinny2013-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] Changing email and url input types in subsilver2 templatesVinny2013-05-207-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] Changing email and url input types in prosilver templatesVinny2013-05-207-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] adding type="number" in ACP; adding type="email" in installSenky2013-05-204-60/+74
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] changing email and url input types in php filesSenky2013-05-203-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | | [ticket/11010] adding new input types into build_cfg_template()Senky2013-05-201-0/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11010
* | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11279' into developNathan Guse2013-05-204-4/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11279: [ticket/11279] Log error in console [ticket/11279] Clearer AJAX errors
| * | | | | [ticket/11279] Log error in consoleVjacheslav Trushkin2013-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB-11279