aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils Adermann2014-06-114-4/+2
|\
| * Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascr...Nils Adermann2014-06-114-4/+2
| |\
| | * [ticket/12352] Use custom provider collection for auth providersMarc Alexander2014-06-011-9/+1
| | * [ticket/12352] Remove usages of user_pass_convert columnMarc Alexander2014-06-013-3/+0
| | * [ticket/12352] Revert to db auth provider if default does not existMarc Alexander2014-06-011-1/+10
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-06-101-5/+5
|\ \ \ | |/ /
| * | [ticket/12688] Correctly use web root path instead of phpbb root pathJoas Schilling2014-06-101-5/+5
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-06-101-2/+2
|\ \ \ | |/ /
| * | [ticket/12508] Fix usages of the finderJoas Schilling2014-06-101-2/+2
* | | Merge pull request #2557 from Elsensee/ticket/12516Joas Schilling2014-06-102-96/+85
|\ \ \
| * | | [ticket/12516] Always preview signature in UCP/ACP moduleOliver Schramm2014-06-072-96/+85
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-101-1/+106
|\ \ \ \ | | |/ / | |/| |
| * | | 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 branch 'develop-ascraeus' into developJoas Schilling2014-06-092-7/+35
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch 'develop-ascraeus' into developNils Adermann2014-06-0911-20/+243
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-091-10/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/12668] Add subforums_row to core.display_forums_modify_template_varsrxu2014-06-091-10/+12
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-091-0/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-091-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display com...Knecht Ruprecht2014-06-091-1/+1
* | | | | | Merge branch 'develop-ascraeus' into developDhruv2014-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
* | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-092-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | [ticket/12675] Fix code sniffer complaints introduced by recent commitsMarc Alexander2014-06-092-2/+2
* | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-06-081-2/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /