aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4485 from marc1706/ticket/14795Tristan Darricau2016-11-061-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/14795] Use maximum topic views instead of adding up views in mergeMarc Alexander2016-10-161-1/+1
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-6/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4486 from marc1706/ticket/11483Tristan Darricau2016-11-061-6/+11
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | [ticket/11483] Generate user act key if database entry is emptyMarc Alexander2016-10-161-6/+11
| | |/ / / / /
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-282-18/+13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4489 from rxu/ticket/14830Marc Alexander2016-10-282-19/+14
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [ticket/14823] Move check_form_key() inside actual save data stepMarc Alexander2016-10-281-5/+5
| | * | | | | [ticket/14830] Fix FORM_INVALID error on cpf settings changingrxu2016-10-241-1/+1
| | * | | | | [ticket/14830] Fix FORM_INVALID error during AСP search index deletionrxu2016-10-211-1/+1
| | * | | | | [ticket/14830] Fix FORM_INVALID error on search backend changingrxu2016-10-211-5/+3
| | * | | | | [ticket/14830] Fix link hash checking caserxu2016-10-211-1/+1
| | * | | | | [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletionrxu2016-10-211-8/+5
| | |/ / / /
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-241-7/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4487 from gmixo/patch-2Tristan Darricau2016-10-241-7/+7
| |\ \ \ \ \
| | * | | | | [ticket/14818] Optimize generate_board_url functionMIkhail Gulyaev2016-10-171-7/+7
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-231-9/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4490 from kasimi/ticket/14827Marc Alexander2016-10-231-9/+11
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | [ticket/14827] Possibility to add multiple form keyskasimi2016-10-191-9/+11
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'prep-release-3.1.10' into 3.1.xMarc Alexander2016-10-121-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [prep-release-3.1.10] Update version numbers for 3.1.10Marc Alexander2016-10-021-1/+1
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-031-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4471 from dsinn/ticket/14802Tristan Darricau2016-10-031-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [ticket/14802] Empty/blank lines should not be additional poll optionsDaniel Sinn2016-09-291-1/+1
| | | |/ / | | |/| |
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-023-13/+29
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-10-023-13/+29
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [ticket/14789] Remove obsolete check_form_key() and add missing hashesMarc Alexander2016-09-302-7/+8
| | * | | [ticket/14789] Move form key checks to where they actually do somethingMarc Alexander2016-09-302-11/+26
| | |/ /
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-011-0/+8
|\ \ \ \ | |/ / /
| * | | [ticket/14795] Merge topic views when merging topicsJakub Senko2016-09-251-0/+8
| |/ /
| * | [3.1.x] Increase version for 3.1.11 developmentMarc Alexander2016-09-241-1/+1
| * | [prep-release-3.1.10] Update version to 3.1.10-RC1Marc Alexander2016-09-241-1/+1
* | | Merge pull request #4265 from Senky/ticket/10809Tristan Darricau2016-09-255-6/+0
|\ \ \
| * | | [ticket/10809] Remove MSSQL supportJakub Senko2016-08-025-6/+0
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-8/+30
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #3527 from Elsensee/ticket/13709Marc Alexander2016-09-241-8/+30
| |\ \ \
| | * | | [ticket/13709] Add fallback for email templates used by extensionsOliver Schramm2016-08-211-8/+30
* | | | | Merge pull request #4459 from rxu/ticket/14794Marc Alexander2016-09-231-2/+2
|\ \ \ \ \
| * | | | | [ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibilityrxu2016-09-231-2/+2
* | | | | | [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+rxu2016-09-221-1/+1
|/ / / / /
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-188-16/+110
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/14789] Add form tokens to tests and uncomment add_form_keyMarc Alexander2016-09-181-1/+1
| * | | | [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.xMarc Alexander2016-09-181-1/+23
|\ \ \ \ \ | |/ / / /