aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/10650]Added permission checking and utf8 functionsRahul R2012-04-051-4/+4
* [ticket/10650] Cropped subject and inserted newlineRahul R2012-04-052-1/+6
* [ticket/10650] Corrected space before trueRahul2012-04-051-1/+1
* [ticket/10650] Changed language files and forumlistRahul2012-04-052-3/+4
* [ticket/10650] Added static sql filesRahul2012-04-057-0/+7
* [ticket/10650] Displaying last topic on forum listRahul2012-04-057-1/+20
* Merge remote-tracking branch 'github-cyberalien/ticket/10752' into developNils Adermann2012-04-031-287/+284
|\
| * [ticket/10752] Fixes for acp_stylesVjacheslav Trushkin2012-04-031-39/+51
| * [ticket/10752] Changing private to protected variables in acp_stylesVjacheslav Trushkin2012-04-031-8/+8
| * [ticket/10752] More fixes for acp_stylesVjacheslav Trushkin2012-04-031-102/+101
| * [ticket/10752] Pass-by-reference fix for acp_stylesVjacheslav Trushkin2012-04-031-12/+12
| * [ticket/10752] Removing globals acp_stylesVjacheslav Trushkin2012-04-031-141/+127
|/
* Merge branch 'develop-olympus' into developVjacheslav Trushkin2012-04-023-0/+28
|\
| * Merge remote-tracking branch 'sadu/ticket/10699' into develop-olympusVjacheslav Trushkin2012-04-023-0/+28
| |\
| | * [ticket/10699] Long h2 title breaks div.minitabs in MCPHari Sankar R2012-04-022-1/+2
| | * [ticket/10699] Long h2 title breaks div.minitabs in MCPHari Sankar R2012-04-023-2/+29
* | | Merge remote-tracking branch 'sadu/ticket/10438' into developIgor Wiedler2012-04-012-1/+5
|\ \ \
| * | | [ticket/10438] Alligning the Smileys on the same line as the text.Hari Sankar R2012-04-022-1/+5
* | | | Merge remote-tracking branch 'cyberalien/ticket/10742' into developIgor Wiedler2012-04-012-5/+1
|\ \ \ \
| * | | | [ticket/10742] Fixing table widthsVjacheslav Trushkin2012-04-012-5/+1
|/ / / /
* | | | Merge pull request #670 from imkingdavid/feature/qrpreviewrxu2012-04-015-9/+20
|\ \ \ \
| * | | | [feature/qrpreview] Do not error or show preview if no text is enteredDavid King2012-03-311-3/+3
| * | | | [feature/qrpreview] Add id qr_postform to prosilver QRDavid King2012-03-301-1/+1
| * | | | [feature/qrpreview] Preview from Quick ReplyDavid King2012-03-305-6/+17
* | | | | Merge remote-tracking branch 'cyberalien/ticket/10665' into developIgor Wiedler2012-04-0115-49/+169
|\ \ \ \ \
| * | | | | [ticket/10665] Adding includejs to acp templatesVjacheslav Trushkin2012-04-011-1/+2
| * | | | | [ticket/10665] Solution for T_SUPER_TEMPLATE_PATHVjacheslav Trushkin2012-04-011-1/+1
| * | | | | [ticket/10665] New test class for templates with treeVjacheslav Trushkin2012-04-014-55/+35
| * | | | | [ticket/10665] Changing template->_js_include to publicVjacheslav Trushkin2012-04-011-1/+1
| * | | | | [ticket/10665] Moving filter parameters to one arrayVjacheslav Trushkin2012-04-011-28/+6
| * | | | | Merge remote-tracking branch 'upstream/develop' into ticket/10665Vjacheslav Trushkin2012-04-0120-43/+51
| |\ \ \ \ \
| * | | | | | [ticket/10665] INCLUDEJS unit testVjacheslav Trushkin2012-04-012-0/+53
| * | | | | | [ticket/10665] Changing template compiler testVjacheslav Trushkin2012-04-011-1/+1
| * | | | | | [ticket/10665] INCLUDEJS template changesVjacheslav Trushkin2012-04-014-1/+5
| * | | | | | [ticket/10665] INCLUDEJS template tagVjacheslav Trushkin2012-04-013-5/+109
* | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into developIgor Wiedler2012-04-011-2/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'igorw/ticket/10740' into developVjacheslav Trushkin2012-04-011-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | [ticket/10740] Revert margin-left changes of previous commitIgor Wiedler2012-04-011-2/+1
* | | | | | | | Merge remote-tracking branch 'sadu/ticket/10740' into developIgor Wiedler2012-04-011-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | [ticket/10740] Changed styling of phpbb_alert box, to be centered.Hari Sankar R2012-04-011-2/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/10733' into developIgor Wiedler2012-04-0114-29/+251
|\ \ \ \ \ \
| * | | | | | [ticket/10733] Fixing testVjacheslav Trushkin2012-04-011-7/+7
| * | | | | | [ticket/10733] Removing static from data providersVjacheslav Trushkin2012-04-0111-26/+26
| | |/ / / / | |/| | | |
| * | | | | [ticket/10733] Adding test for locatorVjacheslav Trushkin2012-04-011-0/+84
| * | | | | [ticket/10733] Adding functions to locate resourcesVjacheslav Trushkin2012-04-013-0/+115
| * | | | | [ticket/10733] Extending get_source_file_for_handleVjacheslav Trushkin2012-03-311-4/+27
* | | | | | Merge branch 'develop-olympus' into developVjacheslav Trushkin2012-04-010-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | [ticket/10731] Fixed addquote() to work on opera browser.Hari Sankar R2012-04-012-4/+4
| | |_|_|/ | |/| | |
* | | | | [ticket/10731] Fixed addquote() to work on opera browser.Hari Sankar R2012-04-012-2/+2
| |_|/ / |/| | |
* | | | Merge remote-tracking branch 'cyberalien/ticket/10735' into developIgor Wiedler2012-03-316-85/+62
|\ \ \ \ | | |/ / | |/| |