aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into develop...Nils Adermann2011-11-181-1/+1
|\
| * [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracledmauri2011-11-151-1/+1
* | Merge remote-tracking branch 'nickvergessen/ticket/10185' into develop-olympusAndreas Fischer2011-11-181-12/+9
|\ \
| * | [ticket/10185] Always set board startdate on conversionJoas Schilling2011-11-151-12/+9
| |/
* | Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympusJoas Schilling2011-11-181-3/+9
|\ \
| * | [ticket/9008] Incorrect unread topic tracking for unapproved topicsrxu2011-09-251-3/+9
* | | Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympusOleg Pudeyev2011-11-172-1/+9
|\ \ \
| * | | [ticket/10157] Add notification to update cpfs when installing a language.Joas Schilling2011-11-172-1/+9
* | | | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-153-0/+51
|\ \ \ \
| * | | | [ticket/10419] Reword the language stringsrxu2011-11-151-8/+8
| * | | | [ticket/10419] Reword some language strings, minor code changesrxu2011-11-052-8/+8
| * | | | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-183-0/+51
* | | | | 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-143-1/+12
|\ \ \ \ \
| * | | | | [ticket/9066] Move regex into get_preg_expression function and add testsJoas Schilling2011-11-142-1/+5
| * | | | | [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
* | | | | | | [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