aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10783] Fixed an HTML error with assets_version.Callum Macrae2012-04-131-1/+1
| | | | PHPBB3-10783
* [ticket/10783] Added assets_version to ACP and simple_*.html.Callum Macrae2012-04-113-6/+6
| | | | PHPBB3-10783
* [ticket/10783] Added assets_version to subsilver2.Callum Macrae2012-04-111-1/+1
| | | | PHPBB3-10783
* [ticket/10783] Added ?assets_version to assets.Callum Macrae2012-04-112-6/+6
| | | | PHPBB3-10783
* Merge PR #716 branch 'develop-olympus' into developOleg Pudeyev2012-04-071-4/+0
|\ | | | | | | | | * develop-olympus: [ticket/10455] Removed NOTE from prosilver overall_header.html.
| * Merge PR #716 branch 'callumacrae/ticket/10455' into develop-olympusOleg Pudeyev2012-04-071-4/+0
| |\ | | | | | | | | | | | | * callumacrae/ticket/10455: [ticket/10455] Removed NOTE from prosilver overall_header.html.
| | * [ticket/10455] Removed NOTE from prosilver overall_header.html.Callum Macrae2012-04-051-4/+0
| | | | | | | | | | | | PHPBB3-10455
* | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-041-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pull request (#654) was merged a little too quickly. In particular, display_last_subject per-forum option needs consensus. This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59. PHPBB3-10650
* | | Merge remote-tracking branch 'rahulr92/ticket/10650' into developDavid King2012-04-041-1/+5
|\ \ \
| * | | [ticket/10650] Cropped subject and inserted newlineRahul R2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subject being displayed in the forum list have been shortened to 30 characters. Also it is now being shown in a separate line. PHPBB3-10650
| * | | [ticket/10650] Changed language files and forumlistRahul2012-04-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entry in languages have been changed from title to subject. Also the IF condition in forumlist_body.html has been properly intented. PHPBB3-10650
| * | | [ticket/10650] Displaying last topic on forum listRahul2012-04-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most recent topic title of the forum can now be displayed on the board index. An option is provided in the ACP under the 'General Forum Setting' which allows the admin to enable or disable this feature. PHPBB3-10650
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-04-044-4/+4
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10607] Added 'Powered by' translation string. Conflicts: phpBB/adm/index.php phpBB/language/en/common.php
| * | [ticket/10607] Added 'Powered by' translation string.Fyorl2012-04-044-4/+4
| | | | | | | | | | | | | | | | | | | | | Added POWERED_BY line to common.php and modified the templates to use it. PHPBB3-10607
* | | Merge branch 'develop-olympus' into developVjacheslav Trushkin2012-04-023-0/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10699] Long h2 title breaks div.minitabs in MCP [ticket/10699] Long h2 title breaks div.minitabs in MCP Conflicts: phpBB/styles/prosilver/theme/tweaks.css
| * | Merge remote-tracking branch 'sadu/ticket/10699' into develop-olympusVjacheslav Trushkin2012-04-023-0/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | * sadu/ticket/10699: [ticket/10699] Long h2 title breaks div.minitabs in MCP [ticket/10699] Long h2 title breaks div.minitabs in MCP
| | * | [ticket/10699] Long h2 title breaks div.minitabs in MCPHari Sankar R2012-04-022-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixed minor issues in formatting. PHPBB3-10699
| | * | [ticket/10699] Long h2 title breaks div.minitabs in MCPHari Sankar R2012-04-023-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed overlapping of Subject title over the minitabs. Added css property to cp.css under MCP Specific tweaks. Wrapped h2 and #minitabs under .tabs-container with clear: both PHPBB3-10699
| * | | [ticket/10731] Fixed addquote() to work on opera browser.Hari Sankar R2012-04-012-4/+4
| |/ / | | | | | | | | | | | | | | | | | | In opera, window.getSelection() returned incorrect values, should be using document.getSelection() instead. Fixed in prosilver and subsilver2 templates. PHPBB3-10731
* | | Merge remote-tracking branch 'sadu/ticket/10438' into developIgor Wiedler2012-04-011-0/+4
|\ \ \ | | | | | | | | | | | | | | | | * sadu/ticket/10438: [ticket/10438] Alligning the Smileys on the same line as the text.
| * | | [ticket/10438] Alligning the Smileys on the same line as the text.Hari Sankar R2012-04-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the styling of smilies to appear at the same level as text, by adding vertical-align: text-bottom css property to all smilies. Edited functions_content.php to add class="smilies" to all parsed smilies. PHPBB3-10438
* | | | [ticket/10742] Fixing table widthsVjacheslav Trushkin2012-04-012-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixing table widths for members list, team page, online users list PHPBB3-10742
* | | | Merge pull request #670 from imkingdavid/feature/qrpreviewrxu2012-04-013-5/+16
|\ \ \ \ | | | | | | | | | | [feature/qrpreview] Preview from Quick Reply
| * | | | [feature/qrpreview] Add id qr_postform to prosilver QRDavid King2012-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10726
| * | | | [feature/qrpreview] Preview from Quick ReplyDavid King2012-03-303-4/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-10726
* | | | | Merge remote-tracking branch 'cyberalien/ticket/10665' into developIgor Wiedler2012-04-014-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10665: [ticket/10665] Adding includejs to acp templates [ticket/10665] Solution for T_SUPER_TEMPLATE_PATH [ticket/10665] New test class for templates with tree [ticket/10665] Changing template->_js_include to public [ticket/10665] Moving filter parameters to one array [ticket/10665] INCLUDEJS unit test [ticket/10665] Changing template compiler test [ticket/10665] INCLUDEJS template changes [ticket/10665] INCLUDEJS template tag
| * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into ticket/10665Vjacheslav Trushkin2012-04-016-8/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: [ticket/10733] Fixing test [ticket/10733] Removing static from data providers [ticket/10731] Fixed addquote() to work on opera browser. [ticket/10731] Fixed addquote() to work on opera browser. [Ticket/10675] Correct language string ATTACH_DISK_FULL [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2 [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language [ticket/10675] Add disk full language string when posting attachments
| * | | | | | [ticket/10665] INCLUDEJS template changesVjacheslav Trushkin2012-04-014-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementing INLCUDEJS template tag in styles PHPBB3-10665
* | | | | | | Merge remote-tracking branch 'igorw/ticket/10740' into developVjacheslav Trushkin2012-04-011-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10740: [ticket/10740] Revert margin-left changes of previous commit [ticket/10740] Changed styling of phpbb_alert box, to be centered.
| * | | | | | [ticket/10740] Revert margin-left changes of previous commitIgor Wiedler2012-04-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10740
| * | | | | | [ticket/10740] Changed styling of phpbb_alert box, to be centered.Hari Sankar R2012-04-011-2/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the styling of the phpbb.alert() and phpbb.confirm() dialogue boxes to me more centered on a page. PHPBB3-10740
* | | | | | [ticket/10731] Fixed addquote() to work on opera browser.Hari Sankar R2012-04-012-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In opera, window.getSelection() returned incorrect values, should be using document.getSelection() instead. Fixed in prosilver and subsilver2 templates. PHPBB3-10731
* | | | | Merge remote-tracking branch 'brunoais/ticket/10705' into developDavid King2012-03-314-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2Bruno Ais2012-03-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Located the L_WARNINGS_ZERO_TOTAL in subsilver2 and replaced it with L_NO_WARNINGS PHPBB3-10705
| * | | | [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilverBruno Ais2012-03-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Located the L_WARNINGS_ZERO_TOTAL in prosilver and replaced it with L_NO_WARNINGS PHPBB3-10705
* | | | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-3119-516/+339
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
| * | | | [feature/ajax] Remove strange non-breaking spaces from approve buttonIgor Wiedler2012-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The viewtopic inline approve/disapprove buttons for posts had spaces. PHPBB3-10270
| * | | | [ticket/10270] Alter background colors for postsVjacheslav Trushkin2012-03-311-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change background colors for posts after deleted post PHPBB3-10270
| * | | | [feature/ajax] Remove quick-reply AJAX handling until we have something goodIgor Wiedler2012-03-312-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation is not very user friendly, lots of things flashing in the user's face. We can re-consider AJAX when we have a decent solution. PHPBB3-10270
| * | | | [ticket/10270] Changing close button for ajax popupsVjacheslav Trushkin2012-03-314-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css PHPBB3-10270
| * | | | [ticket/10270] Disabling links in disappearing contentVjacheslav Trushkin2012-03-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling click events for blocks that are being removed via ajax PHPBB3-10270
| * | | | [ticket/10291] Fixed an AJAX bug on quick reply form submit.Callum Macrae2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It wasn't fading out. PHPBB3-10291
| * | | | [ticket/10273] Fixed accepting / denying posts AJAX.Callum Macrae2012-03-311-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10273
| * | | | [feature/ajax] Fix filter check, quick mod tools data-attributeIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | [feature/ajax] Generic error handling with a phpbb.alert boxIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | [feature/ajax] Change filter semantics, some minor adjustmentsIgor Wiedler2012-03-311-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | [feature/ajax] Refactor phpbb.ajaxify event callbackIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | [feature/ajax] Rename exception to filterIgor Wiedler2012-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | [feature/ajax] Better handling for zebraVjacheslav Trushkin2012-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better handling for zebra: message is displayed instead of first .zebra. Other .zebra entries are emptied, but not completely removed to avoid changing layout. PHPBB3-10272
| * | | | [feature/ajax] Do not hard-code sorting images of acp_forums orderingIgor Wiedler2012-03-311-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10270