aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/14492] Add basic layout for enabling viglinkMarc Alexander2016-12-031-0/+1
* Merge pull request #4543 from marc1706/ticket/9590-rheaTristan Darricau2016-12-031-0/+5
|\
| * Merge branch 'ticket/9590' into ticket/9590-rheaMarc Alexander2016-11-271-0/+5
| |\
| | * [ticket/9590] Submit permissions form in chunks when using "Apply all"Marc Alexander2016-11-261-0/+5
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-021-1/+2
|\ \ \
| * | | [ticket/13757] Properly fix bug with negative PM countVictor A. Safronov2016-12-021-1/+2
* | | | Merge pull request #4547 from VSEphpbb/ticket/14883Marc Alexander2016-12-021-5/+5
|\ \ \ \
| * | | | [ticket/14883] Remove extra tabbageMatt Friedman2016-12-011-3/+3
| * | | | [ticket/14883] Refactor forum rules logicMatt Friedman2016-12-011-11/+6
| * | | | [ticket/14883] Do not display empty forum rules (after reparsing)Matt Friedman2016-11-301-0/+5
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-011-0/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [ticket/13757] Prevents the count of unread PMs from being negativeVictor A. Safronov2016-11-301-0/+6
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-271-0/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4503 from rxu/ticket/14853Marc Alexander2016-11-271-0/+14
| |\ \ \ \
| | * | | | [ticket/14853] Add core event to allow modifying PM attachments download authrxu2016-11-041-0/+14
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-271-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge pull request #4512 from senky/ticket/14863Marc Alexander2016-11-271-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | [ticket/14863] Properly treat plural rules in confirmation box titleJakub Senko2016-11-131-1/+1
* | | | | Merge pull request #4508 from marc1706/ticket/9211Tristan Darricau2016-11-241-0/+3
|\ \ \ \ \
| * | | | | [ticket/9211] Use different icon for link subforum in forum legendMarc Alexander2016-11-161-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-201-1/+11
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4502 from rxu/ticket/14852Marc Alexander2016-11-201-1/+11
| |\ \ \ \
| | * | | | [ticket/14852] Add core event to modify email headersrxu2016-11-041-1/+11
| | | |_|/ | | |/| |
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-202-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4511 from senky/ticket/14842Marc Alexander2016-11-202-2/+2
| |\ \ \ \
| | * | | | [ticket/14842] Don't display filesize limit if there is noneJakub Senko2016-11-152-2/+2
| | |/ / /
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-202-1/+20
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/14850] Add core.generate_smilies_beforeJmz2016-11-201-0/+9
| * | | | [ticket/14850] Add core.smiley_text_root_pathJmz2016-11-201-1/+11
* | | | | Merge remote-tracking branch 'senky/ticket/14739' into 3.2.xMarc Alexander2016-11-177-11/+1
|\ \ \ \ \
| * | | | | [ticket/14739] Remove SQLite 2.8.x database driverJakub Senko2016-11-167-11/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-161-1/+17
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4497 from senky/ticket/14849Marc Alexander2016-11-161-1/+17
| |\ \ \ \
| | * | | | [ticket/14849] Add core.acp_extensions_run_actionJakub Senko2016-11-131-1/+17
| | | |/ / | | |/| |
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-161-1/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge pull request #4510 from senky/ticket/14864Marc Alexander2016-11-161-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/14864] Set maxlength=64 to dateformat in ACPJakub Senko2016-11-131-1/+1
| | |/
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+13
|\ \ \ | |/ /
| * | Merge pull request #4495 from senky/ticket/14847Marc Alexander2016-11-121-1/+13
| |\ \
| | * | [ticket/14847] Add core.acp_attachments_config_edit_addJakub Senko2016-11-021-1/+13
| | |/
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+32
|\ \ \ | |/ /
| * | Merge pull request #4481 from senky/ticket/14819Marc Alexander2016-11-121-1/+32
| |\ \
| | * | [ticket/14819] Hide soft-deleted posts in topic reviewJakub Senko2016-10-131-1/+32
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-7/+21
|\ \ \ \ | |/ / /
| * | | Merge pull request #4472 from dsinn/ticket/14804Marc Alexander2016-11-121-7/+21
| |\ \ \
| | * \ \ [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804Daniel Sinn2016-10-034-13/+37
| | |\ \ \
| | * | | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1Daniel Sinn2016-09-301-1/+1
| | * | | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @sinceDaniel Sinn2016-09-301-3/+3
| | * | | | [ticket/14804] Add core event to MCP after merging topicsDaniel Sinn2016-09-301-6/+20
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-1/+1
|\ \ \ \ \ \ | |/ / / / /