aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/10452' into develop-olympusAndreas Fischer2011-11-142-110/+47
|\
| * [ticket/10452] Fix xHTML errors when print-viewing PMsJoas Schilling2011-11-142-110/+47
* | Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympusAndreas Fischer2011-11-142-6/+9
|\ \
| * | [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-142-6/+9
* | | Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympusAndreas Fischer2011-11-144-1/+47
|\ \ \
| * | | [ticket/9066] Move regex into get_preg_expression function and add testsJoas Schilling2011-11-143-1/+40
| * | | [ticket/9066] Disallow some database prefix to prevent same errors and problemsJoas Schilling2011-11-132-1/+8
| |/ /
* | | Merge remote-tracking branch 'bantu/ticket/10254' into develop-olympusAndreas Fischer2011-11-1411-33/+21
|\ \ \
| * | | [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.cssAndreas Fischer2011-11-141-1/+1
| * | | [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.maelsoucaze2011-11-141-4/+0
| * | | [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.maelsoucaze2011-11-141-4/+0
| * | | [ticket/10254] Remove subsilver2 as default style on theme.maelsoucaze2011-11-141-1/+1
| * | | [ticket/10254] Remove style names from themes and fix some informations on it.maelsoucaze2011-11-1411-30/+26
* | | | Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympusAndreas Fischer2011-11-132-5/+32
|\ \ \ \
| * | | | [ticket/10087] Organize bans in acp_baninto optgroupsIgor Wiedler2011-11-112-5/+32
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympusAndreas Fischer2011-11-134-6/+13
|\ \ \ \
| * | | | [ticket/8616] Include old U_INBOX var for BCIgor Wiedler2011-11-111-2/+3
| * | | | [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGEIgor Wiedler2011-10-132-2/+2
| * | | | [ticket/8616] Direct links in pm notification emailsAlan2011-10-133-4/+10
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/7138' into develop-olympusAndreas Fischer2011-11-131-2/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [ticket/7138] Allow simple header and footer for trigger_error() messagesDavid King2011-11-131-2/+10
|/ / / /
* | | | Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympusIgor Wiedler2011-11-131-6/+2
|\ \ \ \
| * | | | [ticket/10190] Do not show hint about permissions when editing forum settings.Andreas Fischer2011-10-291-6/+2
* | | | | Merge remote-tracking branch 'igorw/ticket/10365' into develop-olympusAndreas Fischer2011-11-132-3/+3
|\ \ \ \ \
| * | | | | [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to readIgor Wiedler2011-11-131-2/+2
| * | | | | [ticket/10365] Require m_report permission to see reports in mcp_postIgor Wiedler2011-10-301-1/+1
| * | | | | [ticket/10365] Make sure moderators only get mcp_reports link when allowedIgor Wiedler2011-10-301-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10437' into develop-olympusAndreas Fischer2011-11-131-0/+6
|\ \ \ \ \
| * | | | | [ticket/10437] Do not display announcements that are waiting for approvalJoas Schilling2011-11-131-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10435' into develop-olympusAndreas Fischer2011-11-131-1/+4
|\ \ \ \ \
| * | | | | [ticket/10435] Readd local announcements to total topic count in viewforumJoas Schilling2011-11-111-1/+4
| |/ / / /
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympusAndreas Fischer2011-11-113-9/+19
|\ \ \ \ \
| * | | | | [ticket/10237] Display login-box for guests, when (un)subscribingJoas Schilling2011-11-063-9/+19
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/7932' into develop-olympusAndreas Fischer2011-11-011-0/+1
|\ \ \ \ \ \
| * | | | | | [ticket/7932] Fix font size in select boxesJoas Schilling2011-10-291-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympusAndreas Fischer2011-11-011-0/+1
|\ \ \ \ \ \
| * | | | | | [ticket/9036] Add template variable 'S_AUTH_READ' to forumlistJoas Schilling2011-10-291-0/+1
| |/ / / / /
* | | | | | Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympusJoas Schilling2011-10-302-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/9778] Replaced "Find a member" with "Enter username"Marc Alexander2011-10-302-1/+2
* | | | | | Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympusIgor Wiedler2011-10-293-2/+9
|\ \ \ \ \ \
| * | | | | | [ticket/9307] Add config variable to installation schema.Chris Smith2011-09-251-0/+1
| * | | | | | [ticket/9307] Remove hardcoded chunk size of mass emails.Chris Smith2011-09-242-2/+8
* | | | | | | Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympusIgor Wiedler2011-10-291-2/+2
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10420] Update includes/startup.php for PHP 5.4.Andreas Fischer2011-10-181-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'cyberalien/ticket/10422' into develop-olympusIgor Wiedler2011-10-291-7/+4
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10422] Invalid "if" in viewtopic_body.htmlVjacheslav Trushkin2011-10-181-7/+4
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympusIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.phpAndreas Fischer2011-10-181-1/+1
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'dellsystem/ticket/olympus/10430' into develop-o...Igor Wiedler2011-10-291-22/+20
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10430] Fix typos/etc in coding guidelinesdellsystem2011-10-281-22/+20
| |/ / / / / /