aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-06-201-0/+4
|\ | | | | | | | | * develop-olympus: [ticket/11094] Add textbox for jabber while memberlist search
| * [ticket/11094] Add textbox for jabber while memberlist searchDhruv2013-06-151-0/+4
| | | | | | | | PHPBB3-11094
* | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' ↵Nathaniel Guse2013-06-062-75/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/editor-code-tabs: [feature/editor-code-tabs] Make inTag function reusable [feature/editor-code-tabs] Check for browser support in function [feature/editor-code-tabs] Apply code editor to everything [feature/editor-code-tabs] Correctly count indentation on first line
| * | [feature/editor-code-tabs] Check for browser support in functionVjacheslav Trushkin2013-05-201-3/+0
| | | | | | | | | | | | | | | | | | | | | Check for browser support and valid textarea in function instead of before applying function. PHPBB3-11557
| * | [feature/editor-code-tabs] Apply code editor to everythingVjacheslav Trushkin2013-05-202-89/+3
| | | | | | | | | | | | | | | | | | | | | | | | Move code editor from prosilver to assets Apply code editor to subsilver2 Apply code editor to ACP elements where bbcode is allowed PHPBB3-11557
| * | [feature/editor-code-tabs] Correctly count indentation on first lineVjacheslav Trushkin2013-05-201-4/+21
| | | | | | | | | | | | | | | | | | Correctly count indentation on first line of code tag PHPBB3-11557
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11564' into developNathaniel Guse2013-06-062-5/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11564: [ticket/11564] Missing new line in tweaks.css [ticket/11564] Notifications popup fixes
| * | | [ticket/11564] Missing new line in tweaks.cssVjacheslav Trushkin2013-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Missing new line at the end of tweaks.css PHPBB3-11564
| * | | [ticket/11564] Notifications popup fixesVjacheslav Trushkin2013-05-232-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix width issue with vertical scrollbar Correctly absolutely position it above link, allowing style authors to move notifications link around in style Fix IE7 positioning PHPBB3-11564
* | | | [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-261-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Simplify colour value check and remove support for '#'Marc Alexander2013-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge remote-tracking branch 'remotes/Senky/ticket/11010' into developNathaniel Guse2013-05-2135-65/+91
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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] Fix input type for urlsVjacheslav Trushkin2013-05-202-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | [ticket/11010] Fix email inputsVjacheslav Trushkin2013-05-203-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] dealing with dimensions problem, removing extra codeSenky2013-05-202-2/+2
| | | | | | | | | | | | | | | | | | | | 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] applying some of EXreaction notesSenky2013-05-206-8/+8
| | | | | | | | | | | | | | | | | | | | 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-205-16/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | [ticket/11010] adding type="number" to CPF int typeSenky2013-05-201-3/+3
| | | | | | | | | | | | | | | | | | | | 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/11279] Clearer AJAX errorsVjacheslav Trushkin2013-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display clearer AJAX errors rather than generic error PHPBB3-11279
* | | | | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' ↵Nathan Guse2013-05-201-0/+99
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into develop # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/editor-code-tabs: [feature/editor-code-tabs] Adjust code style to match guidelines [feature/editor-code-tabs] Correctly calculate end tag location [feature/editor-code-tabs] Allow tabs when typing code
| * | | [feature/editor-code-tabs] Adjust code style to match guidelinesVjacheslav Trushkin2013-05-201-4/+2
| | | | | | | | | | | | | | | | PHPBB3-11557
| * | | [feature/editor-code-tabs] Correctly calculate end tag locationVjacheslav Trushkin2013-05-201-3/+6
| | | | | | | | | | | | | | | | PHPBB3-11557
| * | | [feature/editor-code-tabs] Allow tabs when typing codeVjacheslav Trushkin2013-05-191-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow tabs when typing code in textarea Keep indentation when typing code in textarea PHPBB3-11557
* | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11558' into developNathan Guse2013-05-202-2/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11558: [ticket/11558] Adjustments for notification link [ticket/11558] Fix styling for notifications link
| * | | | [ticket/11558] Adjustments for notification linkVjacheslav Trushkin2013-05-203-12/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11558
| * | | | [ticket/11558] Fix styling for notifications linkVjacheslav Trushkin2013-05-193-1/+21
| |/ / / | | | | | | | | | | | | PHPBB3-11558
* | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11489' into developNathan Guse2013-05-2020-283/+395
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11489: [ticket/11489] IE7 adjustments [ticket/11489] Template changes for new topiclist layout [ticket/11489] CSS changes for topiclist lists
| * | | | [ticket/11489] IE7 adjustmentsVjacheslav Trushkin2013-05-202-5/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-11489
| * | | | [ticket/11489] Template changes for new topiclist layoutVjacheslav Trushkin2013-05-1416-207/+267
| | | | | | | | | | | | | | | | | | | | PHPBB3-11489
| * | | | [ticket/11489] CSS changes for topiclist listsVjacheslav Trushkin2013-05-143-75/+114
| |/ / / | | | | | | | | | | | | PHPBB3-11489
* | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11556' into developNathan Guse2013-05-203-42/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11556: [ticket/11556] Load apply_onkeypress_event() correctly [ticket/11556] Remove fallback JS
| * | | | [ticket/11556] Load apply_onkeypress_event() correctlyVjacheslav Trushkin2013-05-203-11/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11556
| * | | | [ticket/11556] Remove fallback JSVjacheslav Trushkin2013-05-191-32/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11556
* | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11554' into developNathaniel Guse2013-05-195-11/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11554: [ticket/11554] Move forum_fn.js to footer
| * | | | [ticket/11554] Move forum_fn.js to footerVjacheslav Trushkin2013-05-195-11/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | Move forum_fn.js to footer, move find_username to forum_fn.js PHPBB3-11554
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-191-9/+8
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp Conflicts: phpBB/styles/prosilver/template/ucp_groups_manage.html
| * | | [ticket/11537] Adjust error message on ucp group manage to fit rest of ucpMarc Alexander2013-05-141-9/+8
| | |/ | |/| | | | | | | | | | | | | | | | The current look highly differed from the rest of the UCP. Additionally, this caused the error message to be hardly noticeable at all. PHPBB3-11537
* | | [ticket/11555] Fix page comparisonVjacheslav Trushkin2013-05-191-1/+1
| |/ |/| | | | | | | | | Strict comparison should not be used to compare string and number PHPBB3-11555
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into developNathan Guse2013-05-122-157/+140
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11533: [ticket/11533] Update unit tests [ticket/11533] Fix colspan and unnecessary tables [ticket/11533] Change list to table for notification settings [ticket/11533] Columns counter for notification settings
| * | [ticket/11533] Fix colspan and unnecessary tablesVjacheslav Trushkin2013-05-111-123/+115
| | | | | | | | | | | | | | | | | | | | | Fix colspan and remove unnecessary tables in notification settings page in subsilver2. PHPBB3-11533
| * | [ticket/11533] Change list to table for notification settingsVjacheslav Trushkin2013-05-111-34/+25
| | | | | | | | | | | | PHPBB3-11533
* | | Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into developNathaniel Guse2013-05-111-0/+9
|\ \ \ | |/ / |/| |