aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10650]Added permission checking and utf8 functionsRahul R2012-04-051-4/+4
| | | | | | | | Passworded forums and ones in which user doesn't have read access will be excluded. Also uft8 based string functions and html encode/decode functions have been used to sanitise subject. PHPBB3-10650
* [ticket/10650] Cropped subject and inserted newlineRahul R2012-04-052-1/+6
| | | | | | | | 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] Corrected space before trueRahul2012-04-051-1/+1
| | | | | | | Inserted a space before 'true' as per coding guidelines. PHPBB3-10650
* [ticket/10650] Changed language files and forumlistRahul2012-04-052-3/+4
| | | | | | | | 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] Added static sql filesRahul2012-04-057-0/+7
| | | | | | | Ran create_schema_files.php and added the generated static sql files to the commit. PHPBB3-10650
* [ticket/10650] Displaying last topic on forum listRahul2012-04-057-1/+20
| | | | | | | | | 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 remote-tracking branch 'github-cyberalien/ticket/10752' into developNils Adermann2012-04-031-287/+284
|\ | | | | | | | | | | | | | | | | * github-cyberalien/ticket/10752: [ticket/10752] Fixes for acp_styles [ticket/10752] Changing private to protected variables in acp_styles [ticket/10752] More fixes for acp_styles [ticket/10752] Pass-by-reference fix for acp_styles [ticket/10752] Removing globals acp_styles
| * [ticket/10752] Fixes for acp_stylesVjacheslav Trushkin2012-04-031-39/+51
| | | | | | | | | | | | Adding form token, changing functions to public/protected, fixing few more errors PHPBB3-10752
| * [ticket/10752] Changing private to protected variables in acp_stylesVjacheslav Trushkin2012-04-031-8/+8
| | | | | | | | | | | | Changing private to protected variables in acp_styles PHPBB3-10752
| * [ticket/10752] More fixes for acp_stylesVjacheslav Trushkin2012-04-031-102/+101
| | | | | | | | | | | | Fixing return doc blocks, spacing, incorrect sorting function and other minor fixes PHPBB3-10752
| * [ticket/10752] Pass-by-reference fix for acp_stylesVjacheslav Trushkin2012-04-031-12/+12
| | | | | | | | | | | | Fixing pass-by-reference bug in acp_styles PHPBB3-10752
| * [ticket/10752] Removing globals acp_stylesVjacheslav Trushkin2012-04-031-141/+127
|/ | | | | | Removing global variables from functions in acp_styles PHPBB3-10752
* 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
* | | Merge remote-tracking branch 'sadu/ticket/10438' into developIgor Wiedler2012-04-012-1/+5
|\ \ \ | | | | | | | | | | | | | | | | * 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-022-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge remote-tracking branch 'cyberalien/ticket/10742' into developIgor Wiedler2012-04-012-5/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10742: [ticket/10742] Fixing table widths
| * | | | [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-015-9/+20
|\ \ \ \ | | | | | | | | | | [feature/qrpreview] Preview from Quick Reply
| * | | | [feature/qrpreview] Do not error or show preview if no text is enteredDavid King2012-03-311-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10726
| * | | | [feature/qrpreview] Add id qr_postform to prosilver QRDavid King2012-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10726
| * | | | [feature/qrpreview] Preview from Quick ReplyDavid King2012-03-305-6/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-10726
* | | | | Merge remote-tracking branch 'cyberalien/ticket/10665' into developIgor Wiedler2012-04-0115-49/+169
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | [ticket/10665] Adding includejs to acp templatesVjacheslav Trushkin2012-04-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding includejs to acp overall_footer.html PHPBB3-10665
| * | | | | [ticket/10665] Solution for T_SUPER_TEMPLATE_PATHVjacheslav Trushkin2012-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary solution for T_SUPER_TEMPLATE_PATH pointing to wrong directory, variable will be completely removed later because it will be obsolete PHPBB3-10665
| * | | | | [ticket/10665] New test class for templates with treeVjacheslav Trushkin2012-04-014-55/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New parent template test class for tests that use styles tree PHPBB3-10665
| * | | | | [ticket/10665] Changing template->_js_include to publicVjacheslav Trushkin2012-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing template->_js_include to public function PHPBB3-10665
| * | | | | [ticket/10665] Moving filter parameters to one arrayVjacheslav Trushkin2012-04-011-28/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving filter parameters to one array in template compiler class PHPBB3-10665
| * | | | | Merge remote-tracking branch 'upstream/develop' into ticket/10665Vjacheslav Trushkin2012-04-0120-43/+51
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 unit testVjacheslav Trushkin2012-04-012-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding INLCUDEJS test PHPBB3-10665
| * | | | | | [ticket/10665] Changing template compiler testVjacheslav Trushkin2012-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding new constructor parameters to template compiler test PHPBB3-10665
| * | | | | | [ticket/10665] INCLUDEJS template changesVjacheslav Trushkin2012-04-014-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementing INLCUDEJS template tag in styles PHPBB3-10665
| * | | | | | [ticket/10665] INCLUDEJS template tagVjacheslav Trushkin2012-04-013-5/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementing INLCUDEJS template tag in style classes PHPBB3-10665
* | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into developIgor Wiedler2012-04-011-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of github.com:phpbb/phpbb3: [ticket/10740] Revert margin-left changes of previous commit
| * \ \ \ \ \ \ 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
* | | | | | | | Merge remote-tracking branch 'sadu/ticket/10740' into developIgor Wiedler2012-04-011-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | * sadu/ticket/10740: [ticket/10740] Changed styling of phpbb_alert box, to be centered.
| * | | | | | [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
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/10733' into developIgor Wiedler2012-04-0114-29/+251
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10733: [ticket/10733] Fixing test [ticket/10733] Removing static from data providers [ticket/10733] Adding test for locator [ticket/10733] Adding functions to locate resources [ticket/10733] Extending get_source_file_for_handle
| * | | | | | [ticket/10733] Fixing testVjacheslav Trushkin2012-04-011-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing expected and result in locator test PHPBB3-10733
| * | | | | | [ticket/10733] Removing static from data providersVjacheslav Trushkin2012-04-0111-26/+26
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing static from data provider functions PHPBB3-10733
| * | | | | [ticket/10733] Adding test for locatorVjacheslav Trushkin2012-04-011-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding test for $template->locate PHPBB3-10733
| * | | | | [ticket/10733] Adding functions to locate resourcesVjacheslav Trushkin2012-04-013-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding $style->locate() and $template->locate() functions PHPBB3-10733
| * | | | | [ticket/10733] Extending get_source_file_for_handleVjacheslav Trushkin2012-03-311-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extending resource locator's function get_source_file_for_handle to find all files. This modified function should be used by template events to locate all templates before compiling them. PHPBB3-10733
* | | | | | Merge branch 'develop-olympus' into developVjacheslav Trushkin2012-04-010-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10731] Fixed addquote() to work on opera browser.
| * | | | | [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
* | | | | [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 'cyberalien/ticket/10735' into developIgor Wiedler2012-03-316-85/+62
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * cyberalien/ticket/10735: [ticket/10735] Changing locator paths structure