aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11747] ucp_prefs_personal template eventsMatt Friedman2013-07-262-0/+4
| | | | PHPBB3-11747
* [ticket/11741] Fix empty brackets and remove bulletOliver Schramm2013-07-241-2/+2
| | | | PHPBB3-11741
* Merge remote-tracking branch 'cyberalien/ticket/11712' into developAndreas Fischer2013-07-181-1/+1
|\ | | | | | | | | * cyberalien/ticket/11712: [ticket/11712] Fixing typo in editor.js
| * [ticket/11712] Fixing typo in editor.jsVjacheslav Trushkin2013-07-181-1/+1
| | | | | | | | PHPBB3-11712
* | [ticket/11708] Fix bulletin points in notificationsVjacheslav Trushkin2013-07-161-0/+4
|/ | | | PHPBB3-11708
* Merge pull request #1429 from cyberalien/ticket/11553Nathan Guse2013-07-136-29/+85
|\ | | | | Move bulletin points for linklist lists to pseudo classes
| * [ticket/11553] TypoVjacheslav Trushkin2013-07-111-1/+1
| | | | | | | | PHPBB3-11553
| * [ticket/11553] Replace bullet with unicodeVjacheslav Trushkin2013-07-111-2/+2
| | | | | | | | PHPBB3-11553
| * [ticket/11553] Move bulletin points to pseudo classVjacheslav Trushkin2013-07-116-29/+85
| | | | | | | | | | | | | | Move bulletin points for .linklist lists to pseudo class Group pseudo classes for .linklist.bulletin and .icon-notification PHPBB3-11553
* | Merge pull request #1550 from nickvergessen/ticket/9649Nathan Guse2013-07-132-2/+13
|\ \ | | | | | | [ticket/9649] Display information on index for moderators on unapproved posts
| * | [ticket/9649] Display information on index for moderators on unapproved postsJoas Schilling2013-07-132-2/+13
| | | | | | | | | | | | PHPBB3-9649
* | | Merge pull request #1436 from cyberalien/ticket/11563Nathan Guse2013-07-135-50/+50
|\ \ \ | |/ / |/| | Fix subPanels() in forum_fn.js
| * | [ticket/11563] Remove duplicate codeVjacheslav Trushkin2013-07-111-1/+1
| | | | | | | | | | | | PHPBB3-11563
| * | [ticket/11563] Dynamically generate panels listVjacheslav Trushkin2013-07-113-3/+6
| | | | | | | | | | | | PHPBB3-11563
| * | [ticket/11563] Remove unused JS variablesVjacheslav Trushkin2013-07-111-3/+0
| | | | | | | | | | | | | | | | | | Remove unused JS variables from posting_buttons PHPBB3-11563
| * | [ticket/11563] Fix subPanels()Vjacheslav Trushkin2013-07-114-47/+47
| |/ | | | | | | | | | | | | | | Fix subPanels() code Modernize subPanels() with jQuery Use HTML5 data attributes instead of including JS PHPBB3-11563
* | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-1311-14/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * | [ticket/11388] INCLUDECSSNathaniel Guse2013-07-112-0/+4
| | | | | | | | | | | | PHPBB3-11388
| * | [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for coreNathan Guse2013-07-052-3/+7
| | | | | | | | | | | | | | | | | | Moved below overall_footer_after so events can add JS files in that event. PHPBB3-11598
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-043-1/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (44) and others # Via Joas Schilling (4) and others * 'develop' of https://github.com/phpbb/phpbb3: (63 commits) [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha ...
| * | [feature/twig] INCLUDEJS behavior now supports local relative pathsNathaniel Guse2013-07-028-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was done because T_TEMPLATE_PATH is not always correct for js files (e.g. the inheriting style does not include these). Now we use the Twig Loader to find the correct file to link to (most specific file first, then parent styles). Also allows using @namespace convention PHPBB3-11598
| * | [feature/twig] INCLUDEJS now uses the definition classNathaniel Guse2013-07-022-2/+2
| | | | | | | | | | | | | | | | | | | | | This had to be done because, like DEFINE, setting variables to $context only affected the local file and any children, not parent templates. PHPBB3-11598
| * | [feature/twig] Changing INCLUDEJS behavior slightlyNathaniel Guse2013-07-018-8/+8
| | | | | | | | | | | | | | | | | | | | | Automatically parsing inline variables the same way it is done for INCLUDE, INCLUDEPHP PHPBB3-11598
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-0112-25/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (7) and others # Via Andreas Fischer (7) and others * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11593] initialize $is_expr as null before being passed to get_varref [ticket/9341] Assert that page doesnt contain next or prev page posts [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not [ticket/9341] remove PREV_PAGE tpl var used for backward compatability [ticket/11618] Replace glob() with scandir() and string matching [ticket/9341] Add tests for checking Next and Previous template vars [ticket/9341] Move create_topic and post into functional test case [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity [ticket/9341] Use U_PREVIOUS and U_NEXT in template files [ticket/9341] Correctly named template vars Conflicts: tests/template/template_test_case.php
| * \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-241-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (35) and others # Via Andreas Fischer (15) and others * 'develop' of github.com:phpbb/phpbb3: (75 commits) [ticket/10776] update min php version 5.3.3 in readme [ticket/11503] similar implementation for mssql_native and odbc [ticket/11603] Fix out dated comment [ticket/11603] Fix usage note [ticket/11604] Skip installer step where config.php is created. [ticket/11603] Throw RuntimeExceptions instead of using exit() [ticket/11603] Avoid using cURL [ticket/11604] Fix case where config.php is not generated by phpBB. [ticket/11604] Use variables for config.php filesnames. [ticket/11561] Specify used tables in notification fixture, so they are emptied [ticket/11094] Add textbox for jabber while memberlist search [ticket/10820] fix if condition to check for IE [ticket/11603] Split api_request into two functions (query only vs. full url) [ticket/11603] Fix spacing and add some comments [ticket/10820] Add additional check for IE in condition [ticket/11603] Fix github API calls [ticket/11603] Rename network to forks and fix handling [ticket/11603] Fix github api url and use curl with valid user agent [ticket/10820] Fix function docblock [ticket/10820] Inject IE version in function ...
| * | | | [feature/twig] Changing INCLUDEJS behaviorNathan Guse2013-06-248-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was: <!-- INCLUDEJS template/foo.js --> Now: <!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' --> Reasons for this: 1. INCLUDEJS is 3.1-dev only 2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path to styles/name/ directory) 3. INCLUDEJS could not include files from outside directories or anywhere else 4. It was easier to change INCLUDEJS behavior to something more flexible and useful than hack around it to make it work as it was with Twig. PHPBB3-11598
* | | | | [ticket/9657] Add new line after opening diffJoas Schilling2013-07-111-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | [ticket/9657] Fix labels on confirm_delete_body.htmlJoas Schilling2013-07-111-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-1177-1187/+1202
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * | | | Merge remote-tracking branch 'VSEphpbb/ticket/11577' into developAndreas Fischer2013-07-031-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/11577: [ticket/11577] Readjust min-height to 35px [ticket/11577] Correct over-sized Topic Rows
| | * | | | [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 branch 'ticket/11566' into ticket/11566-developDhruv2013-07-012-0/+12
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11566: [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha Conflicts: phpBB/report.php
| | * | | | [ticket/11566] Subsilver template error displayed after table headersDhruv2013-07-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11561
| | * | | | [ticket/11566] Add captcha to report post template in subsilverDhruv2013-07-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11566
| | * | | | [ticket/11566] add error in templateDhruv2013-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if error exists, then display it in the report post template. PHPBB3-11566
| | * | | | [ticket/11566] add interface for captchaDhruv2013-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic captcha template while reporting post when the user is not a registered user. PHPBB3-11566
| * | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into developJoas Schilling2013-06-2912-25/+25
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/9341: [ticket/9341] Assert that page doesnt contain next or prev page posts [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not [ticket/9341] remove PREV_PAGE tpl var used for backward compatability [ticket/9341] Add tests for checking Next and Previous template vars [ticket/9341] Move create_topic and post into functional test case [ticket/9341] Use U_PREVIOUS and U_NEXT in template files [ticket/9341] Correctly named template vars
| | * | | | [ticket/9341] Use U_PREVIOUS and U_NEXT in template filesDhruv2013-06-2212-25/+25
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-9341
| * | | | 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