aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developIgor Wiedler2011-11-131-6/+2
|\
| * 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 branch 'develop-olympus' into developAndreas Fischer2011-11-132-3/+3
|\ \ \ | |/ /
| * | 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 branch 'develop-olympus' into developAndreas Fischer2011-11-131-0/+6
|\ \ \ \ | |/ / /
| * | | 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/develop/10435' into developAndreas Fischer2011-11-131-2/+3
|\ \ \ \ \
| * | | | | [ticket/10435] Remove global announcement from forums total topic countJoas Schilling2011-11-111-1/+4
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-1/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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 branch 'develop-olympus' into developAndreas Fischer2011-11-113-9/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch 'develop-olympus' into developAndreas Fischer2011-11-011-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 branch 'develop-olympus' into developAndreas Fischer2011-11-011-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 'nickvergessen/ticket/10410' into developAndreas Fischer2011-11-016-16/+23
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10410] Add option to display users in their first teampage groupJoas Schilling2011-10-286-16/+23
* | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-302-1/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-293-2/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-291-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-291-7/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-10-291-22/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
| | |/ / / / / /
* | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-28/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'bantu/ticket/10259' into develop-olympusIgor Wiedler2011-10-291-28/+24
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/10259] Do not send notifications to user accounts joining free groups.Andreas Fischer2011-10-171-28/+24
| | |/ / / / / /
* | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /