aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-181-0/+5
|\
| * Merge pull request #4450 from rxu/ticket/14787Tristan Darricau2016-09-181-0/+5
| |\
| | * [ticket/14787] Add more parameters to the core.search_modify_url_parametersrxu2016-09-181-0/+5
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-189-16/+118
|\ \ \ | |/ /
| * | Merge pull request #4452 from marc1706/ticket/14789Tristan Darricau2016-09-189-17/+119
| |\ \
| | * | [ticket/14789] Add form tokens to tests and uncomment add_form_keyMarc Alexander2016-09-182-1/+9
| | * | [ticket/14789] Add link hashes and form tokens to all acp links/buttonsMarc Alexander2016-09-188-17/+111
| |/ /
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-181-4/+5
|\ \ \ | |/ /
| * | Merge pull request #4451 from marc1706/ticket/14788Tristan Darricau2016-09-181-4/+5
| |\ \
| | * | [ticket/14788] Update CREDITS.txtMarc Alexander2016-09-181-4/+5
| | |/
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-181-1/+23
|\ \ \ | |/ /
| * | Merge pull request #4442 from rxu/ticket/14781Marc Alexander2016-09-181-1/+23
| |\ \ | | |/ | |/|
| | * [ticket/14781] Add core event to the function group_user_attributes()rxu2016-09-121-1/+23
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-6/+123
|\ \ \ | |/ /
| * | Merge pull request #4398 from wesleyfok/ticket/14638-3.1.xMarc Alexander2016-09-171-6/+123
| |\ \
| | * | [ticket/14638] Rollback changes from 3.2.x versionWesley Fok2016-08-031-10/+9
| | * | Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.xWesley Fok2016-08-0354-687/+545
| | |\ \
| | * | | [ticket/14638] New UCP hooks for subscriptionsWesley Fok2016-08-031-15/+133
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-173-11/+59
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4403 from rxu/ticket/14738Marc Alexander2016-09-173-11/+59
| |\ \ \ \
| | * | | | [ticket/14738] Add core events to improve modifying forum listsrxu2016-08-073-11/+59
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-4/+108
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4406 from rmcgirr83/ticket/14581Marc Alexander2016-09-171-4/+108
| |\ \ \ \ \
| | * | | | | [ticket/14581] Add core events to content_visibilityRichard McGirr2016-08-101-4/+108
| | |/ / / /
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4449 from DavidIQ/ticket/14782Marc Alexander2016-09-171-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/14782] Don't use 'DISTINCT' when using 'SQL_CALC_FOUND_ROWS'DavidIQ2016-09-161-1/+1
* | | | | | | Merge branch '3.1.x' into 3.2.xAndreas Fischer2016-09-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4444 from DavidIQ/ticket/14782Andreas Fischer2016-09-151-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | [ticket/14782] Use the $select variable in "Your Posts" searchDavidIQ2016-09-131-1/+1
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-142-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'VSEphpbb/ticket/14783' into 3.1.xMarc Alexander2016-09-142-0/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/14783] Add template event before custom BBCodes in ACPMatt Friedman2016-09-142-0/+8
* | | | | | Merge pull request #4440 from danchr/ticket/14774Tristan Darricau2016-09-112-50/+110
|\ \ \ \ \ \
| * | | | | | [ticket/14774] Support partial downloads of attachmentsDan Villiom Podlaski Christiansen2016-09-072-50/+110
| | |/ / / / | |/| | | |
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-112-1/+19
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #4371 from imkingdavid/ticket/14695Marc Alexander2016-09-113-2/+26
| |\ \ \ \ \
| | * | | | | [ticket/14695] Add posting_editor_subject_append/prepend subsilver2 to events.mdDavid King2016-08-091-0/+2
| | * | | | | [ticket/14695] Added posting_editor_subject_append/prepend events to subsilverDavid King2016-08-091-1/+5
| | * | | | | [ticket/14695] Put posting_editor_subject_append/prepend events on newlinesDavid King2016-08-091-1/+5
| | * | | | | [ticket/14695] Updated version number in events.mdDavid King2016-06-251-2/+2
| | * | | | | [ticket/14695] Add posting_editor_subject_prepend/append template eventsDavid King2016-06-252-1/+15
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4438 from danchr/ticket/12133Marc Alexander2016-09-091-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/12133] fix download file names for WebKit-derived browsersDan Villiom Podlaski Christiansen2016-09-071-1/+1
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4428 from rmcgirr83/ticket/14755Marc Alexander2016-09-072-2/+2
| |\ \ \ \ \ \
| | * | | | | | [ticket/14755] Fix subsilver2Richard McGirr2016-08-311-1/+1
| | * | | | | | [ticket/14755] Fix max length in mcp topic html fileRMcGirr832016-08-301-1/+1
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-062-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /