Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop-olympus' into develop | Igor Wiedler | 2011-11-13 | 1 | -6/+2 |
|\ | |||||
| * | Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympus | Igor Wiedler | 2011-11-13 | 1 | -6/+2 |
| |\ | |||||
| | * | [ticket/10190] Do not show hint about permissions when editing forum settings. | Andreas Fischer | 2011-10-29 | 1 | -6/+2 |
* | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-11-13 | 2 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge remote-tracking branch 'igorw/ticket/10365' into develop-olympus | Andreas Fischer | 2011-11-13 | 2 | -3/+3 |
| |\ \ | |||||
| | * | | [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read | Igor Wiedler | 2011-11-13 | 1 | -2/+2 |
| | * | | [ticket/10365] Require m_report permission to see reports in mcp_post | Igor Wiedler | 2011-10-30 | 1 | -1/+1 |
| | * | | [ticket/10365] Make sure moderators only get mcp_reports link when allowed | Igor Wiedler | 2011-10-30 | 1 | -2/+2 |
* | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-11-13 | 1 | -0/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10437' into develop-olympus | Andreas Fischer | 2011-11-13 | 1 | -0/+6 |
| |\ \ \ | |||||
| | * | | | [ticket/10437] Do not display announcements that are waiting for approval | Joas Schilling | 2011-11-13 | 1 | -0/+6 |
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/develop/10435' into develop | Andreas Fischer | 2011-11-13 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | [ticket/10435] Remove global announcement from forums total topic count | Joas Schilling | 2011-11-11 | 1 | -1/+4 |
* | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-11-13 | 1 | -1/+4 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10435' into develop-olympus | Andreas Fischer | 2011-11-13 | 1 | -1/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/10435] Readd local announcements to total topic count in viewforum | Joas Schilling | 2011-11-11 | 1 | -1/+4 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-11-11 | 3 | -9/+19 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympus | Andreas Fischer | 2011-11-11 | 3 | -9/+19 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/10237] Display login-box for guests, when (un)subscribing | Joas Schilling | 2011-11-06 | 3 | -9/+19 |
* | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-11-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/7932' into develop-olympus | Andreas Fischer | 2011-11-01 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/7932] Fix font size in select boxes | Joas Schilling | 2011-10-29 | 1 | -0/+1 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-11-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympus | Andreas Fischer | 2011-11-01 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist | Joas Schilling | 2011-10-29 | 1 | -0/+1 |
| | |/ / / / / | |||||
* | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop | Andreas Fischer | 2011-11-01 | 6 | -16/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ticket/10410] Add option to display users in their first teampage group | Joas Schilling | 2011-10-28 | 6 | -16/+23 |
* | | | | | | | | Merge branch 'develop-olympus' into develop | Joas Schilling | 2011-10-30 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympus | Joas Schilling | 2011-10-30 | 2 | -1/+2 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | [ticket/9778] Replaced "Find a member" with "Enter username" | Marc Alexander | 2011-10-30 | 2 | -1/+2 |
* | | | | | | | Merge branch 'develop-olympus' into develop | Igor Wiedler | 2011-10-29 | 3 | -2/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympus | Igor Wiedler | 2011-10-29 | 3 | -2/+9 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/9307] Add config variable to installation schema. | Chris Smith | 2011-09-25 | 1 | -0/+1 |
| | * | | | | | | [ticket/9307] Remove hardcoded chunk size of mass emails. | Chris Smith | 2011-09-24 | 2 | -2/+8 |
* | | | | | | | | Merge branch 'develop-olympus' into develop | Igor Wiedler | 2011-10-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympus | Igor Wiedler | 2011-10-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/10420] Update includes/startup.php for PHP 5.4. | Andreas Fischer | 2011-10-18 | 1 | -2/+2 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
* | | | | | | | | Merge branch 'develop-olympus' into develop | Igor Wiedler | 2011-10-29 | 1 | -7/+4 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/10422' into develop-olympus | Igor Wiedler | 2011-10-29 | 1 | -7/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/10422] Invalid "if" in viewtopic_body.html | Vjacheslav Trushkin | 2011-10-18 | 1 | -7/+4 |
| | |/ / / / / / | |||||
* | | | | | | | | Merge branch 'develop-olympus' into develop | Igor Wiedler | 2011-10-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympus | Igor Wiedler | 2011-10-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php | Andreas Fischer | 2011-10-18 | 1 | -1/+1 |
| | |/ / / / / / | |||||
* | | | | | | | | Merge branch 'develop-olympus' into develop | Igor Wiedler | 2011-10-29 | 1 | -22/+20 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'dellsystem/ticket/olympus/10430' into develop-o... | Igor Wiedler | 2011-10-29 | 1 | -22/+20 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/10430] Fix typos/etc in coding guidelines | dellsystem | 2011-10-28 | 1 | -22/+20 |
| | |/ / / / / / | |||||
* | | | | | | | | Merge branch 'develop-olympus' into develop | Igor Wiedler | 2011-10-29 | 1 | -28/+24 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'bantu/ticket/10259' into develop-olympus | Igor Wiedler | 2011-10-29 | 1 | -28/+24 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/10259] Do not send notifications to user accounts joining free groups. | Andreas Fischer | 2011-10-17 | 1 | -28/+24 |
| | |/ / / / / / | |||||
* | | | | | | | | Merge branch 'develop-olympus' into develop | Igor Wiedler | 2011-10-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |