aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12687] Add a constant to display the load time without DEBUGTristan Darricau2014-06-102-6/+6
* Merge pull request #2518 from Pico88/ticket/12606Joas Schilling2014-06-101-1/+106
|\
| * [ticket/12606] Add ACP group core eventsPico882014-06-091-1/+106
* | Merge pull request #2434 from Nicofuma/ticket/8610Joas Schilling2014-06-092-7/+35
|\ \
| * | [ticket/8610] Throw an error when the dest topic isn't setTristan Darricau2014-05-271-1/+1
| * | [ticket/8610] Fix bookmarks when merging all the posts of a topicTristan Darricau2014-05-271-4/+18
| * | [ticket/8610] Merging topics does not handle bookmarks correctlyTristan Darricau2014-05-101-3/+17
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop...Nils Adermann2014-06-0911-20/+243
|\ \ \
| * | | [ticket/10073] Do not check disable boxes by defaultJoas Schilling2014-06-091-1/+1
| * | | [ticket/10073] Store values with config_text in the ACPJoas Schilling2014-05-291-8/+17
| * | | [ticket/10073] Fix request usageJoas Schilling2014-05-291-1/+3
| * | | [ticket/10073] Deduplicate template variable namesJoas Schilling2014-05-291-3/+3
| * | | [ticket/10073] Get service from containerJoas Schilling2014-05-291-2/+2
| * | | [ticket/10073] Move template code into the templateJoas Schilling2014-05-291-3/+3
| * | | [ticket/10073] Split email validation from email ban and taken checksJoas Schilling2014-05-294-13/+38
| * | | [ticket/10073] Deduplicate the if statementJoas Schilling2014-05-294-36/+43
| * | | [ticket/10073] Fallback to board_contact when contact page is disabledJoas Schilling2014-05-294-4/+38
| * | | [ticket/10073] Add ACP module to add bbcode text for contact admin infoJoas Schilling2014-05-293-0/+145
| * | | [ticket/10073] Remove unneccessary todos he config switch is enoughJoas Schilling2014-05-291-1/+1
| * | | [ticket/10073] Use namespaces and fix all class namesJoas Schilling2014-05-295-684/+0
| * | | [ticket/10073] Replace board_contact mail with links to contact pageNils Adermann2014-05-296-12/+10
| * | | [ticket/10073] Add a contact administrators page and refactor email forms.Nils Adermann2014-05-296-0/+687
| | |/ | |/|
* | | [ticket/12668] Add subforums_row to core.display_forums_modify_template_varsrxu2014-06-091-10/+12
* | | Merge pull request #2554 from rxu/ticket/12669Joas Schilling2014-06-091-0/+22
|\ \ \
| * | | [ticket/12669] Add core event to the function display_forums()rxu2014-06-081-0/+22
* | | | [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display com...Knecht Ruprecht2014-06-091-1/+1
* | | | Merge branch 'develop-olympus' into develop-ascraeusDhruv2014-06-091-1/+1
|\ \ \ \
| * | | | [ticket/12660] Improve check for when phpinfo() is disabled.Andreas Fischer2014-06-091-1/+1
| * | | | Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into devel...Nils Adermann2014-05-021-1/+1
| |\ \ \ \
| | * | | | [ticket/8960] Allow changing avatar path if it's not writableMarc Alexander2014-04-141-1/+1
* | | | | | [ticket/12675] Fix code sniffer complaints introduced by recent commitsMarc Alexander2014-06-092-2/+2
* | | | | | [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.Andreas Fischer2014-06-081-2/+8
| |_|/ / / |/| | | |
* | | | | Merge pull request #2526 from Nicofuma/ticket/12639Andreas Fischer2014-06-042-12/+2
|\ \ \ \ \
| * | | | | [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logsTristan Darricau2014-06-021-7/+1
| * | | | | [ticket/12639] Send a correct IN entry when deleting marked logsTristan Darricau2014-06-022-2/+2
| * | | | | [ticket/12639] Delete entry in admin-log leads to mysql-errorTristan Darricau2014-05-312-4/+0
* | | | | | [ticket/12566] Also changed for ucp_pm_viewmessage.phpPayBas2014-06-021-1/+1
|/ / / / /
* | | | | Merge pull request #2433 from Nicofuma/ticket/10899Joas Schilling2014-05-302-21/+35
|\ \ \ \ \
| * | | | | [ticket/10899] Get $phpbb_log from the containerTristan Darricau2014-05-271-1/+3
| * | | | | [ticket/10899] Refactoring in \phpbb\log\log_interfaceTristan Darricau2014-05-102-30/+28
| * | | | | [ticket/10899] Using Delete All in log viewer with keyword searchTristan Darricau2014-05-102-4/+18
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2357 from Nicofuma/ticket/11942Joas Schilling2014-05-302-9/+7
|\ \ \ \ \
| * | | | | [ticket/11942] Don't change the reason to '' when hard deletingTristan Darricau2014-05-291-2/+2
| * | | | | [ticket/11942] Always display delete reasonTristan Darricau2014-05-111-2/+0
| * | | | | [ticket/11942] Edits messagesNicofuma2014-05-041-1/+1
| * | | | | [ticket/11942] Adding the reason to hard deleted topic/postNicofuma2014-05-041-2/+2
| * | | | | [ticket/11942] Delete post/topic reason should be added to logsNicofuma2014-05-041-2/+2
* | | | | | Merge pull request #2447 from n-aleha/ticket/11467Joas Schilling2014-05-302-2/+2
|\ \ \ \ \ \
| * | | | | | [ticket/11467] Add language variables for extension exception messagesn-aleha2014-05-292-2/+2
* | | | | | | Merge pull request #2512 from bantu/ticket/11266Joas Schilling2014-05-301-1/+5
|\ \ \ \ \ \ \