aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
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-111-6/+15
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympusAndreas Fischer2011-11-111-6/+15
| |\ \ \
| | * | | [ticket/10237] Display login-box for guests, when (un)subscribingJoas Schilling2011-11-061-6/+15
* | | | | 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-011-6/+6
|\ \ \ \ \
| * | | | | [ticket/10410] Add option to display users in their first teampage groupJoas Schilling2011-10-281-6/+6
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-2/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympusIgor Wiedler2011-10-291-2/+3
| |\ \ \ \ \
| | * | | | | [ticket/9307] Remove hardcoded chunk size of mass emails.Chris Smith2011-09-241-2/+3
* | | | | | | 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-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-28/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/10259] Do not send notifications to user accounts joining free groups.Andreas Fischer2011-10-171-28/+24
| |/ / / / /
* | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/10390' into developOleg Pudeyev2011-10-203-0/+5
|\ \ \ \ \ \
| * | | | | | [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACPMatt Friedman2011-09-274-49/+5
| * | | | | | [ticket/10390] Drop http protocol for Microsoft's CDN optionMatt Friedman2011-09-271-3/+4
| * | | | | | [ticket/10390] Improve the jQuery CDN url generation functionMatt Friedman2011-09-261-4/+7
| * | | | | | [ticket/10390] Move jQuery version definitionMatt Friedman2011-09-261-1/+3
| * | | | | | [ticket/10390] Allow option for jQuery to be hosted by a remote CDNMatt Friedman2011-09-264-0/+43
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-171-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympusAndreas Fischer2011-10-171-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/9525] Minimum post length 0 is accepted but not working.Joas Schilling2011-10-141-1/+1
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-9/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'github-igorw/ticket/10377' into develop-olympusNils Adermann2011-10-141-9/+8
| |\ \ \ \ \ \
| | * | | | | | [ticket/10377] Do not allow all moderators to sticky postsIgor Wiedler2011-10-141-9/+8
* | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-141-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-141-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.Andreas Fischer2011-10-141-1/+1
| | |/ / / / / /
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-142-123/+105
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | [ticket/8240] Add ability to get a list of columns of a tables to db_tools.Andreas Fischer2011-10-141-74/+37
| * | | | | | | [ticket/8240] Add ability to get a list of tables to db_tools.Andreas Fischer2011-10-142-49/+68
| |/ / / / / /
* | | | | | | [feature/functional-tests] Generate config correctly and install only onceNils Adermann2011-10-141-1/+43
* | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-141-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.Andreas Fischer2011-10-141-1/+1
* | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-141-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /