Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 1 | -1/+13 |
|\ | |||||
| * | Merge pull request #4495 from senky/ticket/14847 | Marc Alexander | 2016-11-12 | 1 | -1/+13 |
| |\ | |||||
| | * | [ticket/14847] Add core.acp_attachments_config_edit_add | Jakub Senko | 2016-11-02 | 1 | -1/+13 |
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 1 | -1/+32 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #4481 from senky/ticket/14819 | Marc Alexander | 2016-11-12 | 1 | -1/+32 |
| |\ \ | |||||
| | * | | [ticket/14819] Hide soft-deleted posts in topic review | Jakub Senko | 2016-10-13 | 1 | -1/+32 |
* | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 1 | -7/+21 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #4472 from dsinn/ticket/14804 | Marc Alexander | 2016-11-12 | 1 | -7/+21 |
| |\ \ \ | |||||
| | * \ \ | [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804 | Daniel Sinn | 2016-10-03 | 4 | -13/+37 |
| | |\ \ \ | |||||
| | * | | | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1 | Daniel Sinn | 2016-09-30 | 1 | -1/+1 |
| | * | | | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @since | Daniel Sinn | 2016-09-30 | 1 | -3/+3 |
| | * | | | | [ticket/14804] Add core event to MCP after merging topics | Daniel Sinn | 2016-09-30 | 1 | -6/+20 |
* | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-11-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #4485 from marc1706/ticket/14795 | Tristan Darricau | 2016-11-06 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/14795] Use maximum topic views instead of adding up views in merge | Marc Alexander | 2016-10-16 | 1 | -1/+1 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-11-06 | 1 | -6/+11 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #4486 from marc1706/ticket/11483 | Tristan Darricau | 2016-11-06 | 1 | -6/+11 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | [ticket/11483] Generate user act key if database entry is empty | Marc Alexander | 2016-10-16 | 1 | -6/+11 |
| | |/ / / | |||||
* | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-10-28 | 2 | -18/+13 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #4489 from rxu/ticket/14830 | Marc Alexander | 2016-10-28 | 2 | -19/+14 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/14823] Move check_form_key() inside actual save data step | Marc Alexander | 2016-10-28 | 1 | -5/+5 |
| | * | | | | [ticket/14830] Fix FORM_INVALID error on cpf settings changing | rxu | 2016-10-24 | 1 | -1/+1 |
| | * | | | | [ticket/14830] Fix FORM_INVALID error during AСP search index deletion | rxu | 2016-10-21 | 1 | -1/+1 |
| | * | | | | [ticket/14830] Fix FORM_INVALID error on search backend changing | rxu | 2016-10-21 | 1 | -5/+3 |
| | * | | | | [ticket/14830] Fix link hash checking case | rxu | 2016-10-21 | 1 | -1/+1 |
| | * | | | | [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletion | rxu | 2016-10-21 | 1 | -8/+5 |
| | |/ / / | |||||
* | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-10-24 | 1 | -7/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #4487 from gmixo/patch-2 | Tristan Darricau | 2016-10-24 | 1 | -7/+7 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/14818] Optimize generate_board_url function | MIkhail Gulyaev | 2016-10-17 | 1 | -7/+7 |
* | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-10-23 | 1 | -9/+11 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #4490 from kasimi/ticket/14827 | Marc Alexander | 2016-10-23 | 1 | -9/+11 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | [ticket/14827] Possibility to add multiple form keys | kasimi | 2016-10-19 | 1 | -9/+11 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'prep-release-3.1.10' into 3.1.x | Marc Alexander | 2016-10-12 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | [prep-release-3.1.10] Update version numbers for 3.1.10 | Marc Alexander | 2016-10-02 | 1 | -1/+1 |
* | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-10-03 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #4471 from dsinn/ticket/14802 | Tristan Darricau | 2016-10-03 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | [ticket/14802] Empty/blank lines should not be additional poll options | Daniel Sinn | 2016-09-29 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
* | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-10-02 | 3 | -13/+29 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'prep-release-3.1.10' into 3.1.x | Tristan Darricau | 2016-10-02 | 3 | -13/+29 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | [ticket/14789] Remove obsolete check_form_key() and add missing hashes | Marc Alexander | 2016-09-30 | 2 | -7/+8 |
| | * | | [ticket/14789] Move form key checks to where they actually do something | Marc Alexander | 2016-09-30 | 2 | -11/+26 |
| | |/ | |||||
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-10-01 | 1 | -0/+8 |
|\ \ \ | |/ / | |||||
| * | | [ticket/14795] Merge topic views when merging topics | Jakub Senko | 2016-09-25 | 1 | -0/+8 |
| |/ | |||||
| * | [3.1.x] Increase version for 3.1.11 development | Marc Alexander | 2016-09-24 | 1 | -1/+1 |
| * | [prep-release-3.1.10] Update version to 3.1.10-RC1 | Marc Alexander | 2016-09-24 | 1 | -1/+1 |
* | | Merge pull request #4265 from Senky/ticket/10809 | Tristan Darricau | 2016-09-25 | 5 | -6/+0 |
|\ \ | |||||
| * | | [ticket/10809] Remove MSSQL support | Jakub Senko | 2016-08-02 | 5 | -6/+0 |
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-09-24 | 1 | -8/+30 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #3527 from Elsensee/ticket/13709 | Marc Alexander | 2016-09-24 | 1 | -8/+30 |
| |\ \ | |||||
| | * | | [ticket/13709] Add fallback for email templates used by extensions | Oliver Schramm | 2016-08-21 | 1 | -8/+30 |