| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #4502 from rxu/ticket/14852 | Marc Alexander | 2016-11-20 | 1 | -1/+11 |
| |\ | | | | | | | [ticket/14852] Add core event to modify email headers | ||||
| | * | [ticket/14852] Add core event to modify email headers | rxu | 2016-11-04 | 1 | -1/+11 |
| | | | | | | | | | PHPBB3-14852 | ||||
| * | | Merge pull request #4511 from senky/ticket/14842 | Marc Alexander | 2016-11-20 | 2 | -2/+2 |
| |\ \ | | | | | | | | | | [ticket/14842] Don't display filesize limit if there is none | ||||
| | * | | [ticket/14842] Don't display filesize limit if there is none | Jakub Senko | 2016-11-15 | 2 | -2/+2 |
| | |/ | | | | | | | PHPBB3-14842 | ||||
| * | | [ticket/14850] Add core.generate_smilies_before | Jmz | 2016-11-20 | 1 | -0/+9 |
| | | | | | | | | | | | | | Allows changing root_path of smilies to use CDN for example PHPBB3-14850 | ||||
| * | | [ticket/14850] Add core.smiley_text_root_path | Jmz | 2016-11-20 | 1 | -1/+11 |
| | | | | | | | | | | | | | Allows changing root_path of smilies to use CDN for example PHPBB3-14850 | ||||
| * | | Merge pull request #4497 from senky/ticket/14849 | Marc Alexander | 2016-11-16 | 1 | -1/+17 |
| |\ \ | | | | | | | | | | [ticket/14849] Add core.acp_extensions_run_action | ||||
| | * | | [ticket/14849] Add core.acp_extensions_run_action | Jakub Senko | 2016-11-13 | 1 | -1/+17 |
| | |/ | | | | | | | PHPBB3-14849 | ||||
| * | | Merge pull request #4510 from senky/ticket/14864 | Marc Alexander | 2016-11-16 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | [ticket/14864] Set maxlength=64 to dateformat in ACP | ||||
| | * | | [ticket/14864] Set maxlength=64 to dateformat in ACP | Jakub Senko | 2016-11-13 | 1 | -1/+1 |
| | |/ | | | | | | | PHPBB3-14864 | ||||
| * | | 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 | ||||
| | * | | [ticket/14847] Add core.acp_attachments_config_edit_add | Jakub Senko | 2016-11-02 | 1 | -1/+13 |
| | |/ | | | | | | | PHPBB3-14847 | ||||
| * | | 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 | ||||
| | * | | [ticket/14819] Hide soft-deleted posts in topic review | Jakub Senko | 2016-10-13 | 1 | -1/+32 |
| | | | | | | | | | | | | | PHPBB3-14819 | ||||
| * | | | Merge pull request #4472 from dsinn/ticket/14804 | Marc Alexander | 2016-11-12 | 1 | -7/+21 |
| |\ \ \ | | | | | | | | | | | | | [ticket/14804] Add core event to MCP after merging topics | ||||
| | * \ \ | [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804 | Daniel Sinn | 2016-10-03 | 4 | -13/+37 |
| | |\ \ \ | | | | | | | | | | | | | | | | PHPBB3-14804 | ||||
| | * | | | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1 | Daniel Sinn | 2016-09-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804 | ||||
| | * | | | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @since | Daniel Sinn | 2016-09-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804 | ||||
| | * | | | | [ticket/14804] Add core event to MCP after merging topics | Daniel Sinn | 2016-09-30 | 1 | -6/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed $topic_data and defined $to_topic_data in order to avoid ambiguity and to stop overwriting a variable. PHPBB3-14804 | ||||
| * | | | | | 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 * github.com:phpbb/phpbb: [ticket/14795] Use maximum topic views instead of adding up views in merge | ||||
| | * | | | | | [ticket/14795] Use maximum topic views instead of adding up views in merge | Marc Alexander | 2016-10-16 | 1 | -1/+1 |
| | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging topics should not result in topic views being added up but rather in the highest topic view showing up for the merged topic. PHPBB3-14795 | ||||
| * | | | | | 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 * github.com:phpbb/phpbb: [ticket/11483] Add tests for generating user act key on force reactivate [ticket/11483] Generate user act key if database entry is empty | ||||
| | * | | | | [ticket/11483] Generate user act key if database entry is empty | Marc Alexander | 2016-10-16 | 1 | -6/+11 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The force reactivation action in the ACP will no longer overwrite the generated activation key in case the key stored in the database is empty. It will also save the generated key back to the database to actually allow the activation by the user. PHPBB3-11483 | ||||
| * | | | | Merge pull request #4489 from rxu/ticket/14830 | Marc Alexander | 2016-10-28 | 2 | -19/+14 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/14830] Fix FORM_INVALID error during some ACP setting operations | ||||
| | * | | | | [ticket/14823] Move check_form_key() inside actual save data step | Marc Alexander | 2016-10-28 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14823 | ||||
| | * | | | | [ticket/14830] Fix FORM_INVALID error on cpf settings changing | rxu | 2016-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | * | | | | [ticket/14830] Fix FORM_INVALID error during AСP search index deletion | rxu | 2016-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | * | | | | [ticket/14830] Fix FORM_INVALID error on search backend changing | rxu | 2016-10-21 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | * | | | | [ticket/14830] Fix link hash checking case | rxu | 2016-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14830 | ||||
| | * | | | | [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletion | rxu | 2016-10-21 | 1 | -8/+5 |
| | |/ / / | | | | | | | | | | | | | PHPBB3-14830 | ||||
| * | | | | Merge pull request #4487 from gmixo/patch-2 | Tristan Darricau | 2016-10-24 | 1 | -7/+7 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14818] Optimize generate_board_url function * gmixo/patch-2: [ticket/14818] Optimize generate_board_url function | ||||
| | * | | | | [ticket/14818] Optimize generate_board_url function | MIkhail Gulyaev | 2016-10-17 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | if $config['force_server_vars'] no need to calculate $request | ||||
| * | | | | | Merge pull request #4490 from kasimi/ticket/14827 | Marc Alexander | 2016-10-23 | 1 | -9/+11 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | [ticket/14827] Fix adding multiple form keys | ||||
| | * | | | | [ticket/14827] Possibility to add multiple form keys | kasimi | 2016-10-19 | 1 | -9/+11 |
| | | |/ / | |/| | | | | | | | | | | PHPBB3-14827 | ||||
| * | | | | 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 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 * dsinn/ticket/14802: [ticket/14802] Add test for empty/blank lines in poll options [ticket/14802] Empty/blank lines should not be additional poll options | ||||
| | * | | | [ticket/14802] Empty/blank lines should not be additional poll options | Daniel Sinn | 2016-09-29 | 1 | -1/+1 |
| | | |/ | |/| | | | | | | | PHPBB3-14802 | ||||
| * | | | Merge branch 'prep-release-3.1.10' into 3.1.x | Tristan Darricau | 2016-10-02 | 3 | -13/+29 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | * prep-release-3.1.10: [ticket/14789] Remove obsolete check_form_key() and add missing hashes [ticket/14789] Move form key checks to where they actually do something | ||||
| | * | | [ticket/14789] Remove obsolete check_form_key() and add missing hashes | Marc Alexander | 2016-09-30 | 2 | -7/+8 |
| | | | | | | | | | | | | | PHPBB3-14789 | ||||
| | * | | [ticket/14789] Move form key checks to where they actually do something | Marc Alexander | 2016-09-30 | 2 | -11/+26 |
| | |/ | | | | | | | PHPBB3-14789 | ||||
| * | | [ticket/14795] Merge topic views when merging topics | Jakub Senko | 2016-09-25 | 1 | -0/+8 |
| |/ | | | | PHPBB3-14795 | ||||
| * | [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 #3527 from Elsensee/ticket/13709 | Marc Alexander | 2016-09-24 | 1 | -8/+30 |
| |\ | | | | | | | [ticket/13709] Add fallback for email templates used by extensions | ||||
| | * | [ticket/13709] Add fallback for email templates used by extensions | Oliver Schramm | 2016-08-21 | 1 | -8/+30 |
| | | | | | | | | | | | | | | | Also add a fallback to english for the core like we do it in $user->add_lang() PHPBB3-13709 | ||||
| * | | [ticket/14789] Add form tokens to tests and uncomment add_form_key | Marc Alexander | 2016-09-18 | 1 | -1/+1 |
| | | | | | | | | | PHPBB3-14789 | ||||
| * | | [ticket/14789] Add link hashes and form tokens to all acp links/buttons | Marc Alexander | 2016-09-18 | 8 | -17/+111 |
| | | | | | | | | | | | | | | | | | | | | | | | This will further harden the ACP security by adding link hashes to links and form tokens to forms that did not have these yet and result in modified settings or write action on the filesystem or database. These few links and forms were still relying on the global ACP protection, mainly due to them not posing further risks of compromising data. After this change these will now also be properly protected against tampering. PHPBB3-14789 | ||||
| * | | Merge pull request #4442 from rxu/ticket/14781 | Marc Alexander | 2016-09-18 | 1 | -1/+23 |
| |\ \ | | | | | | | | | | [ticket/14781] Add core event to the function group_user_attributes() | ||||
| | * | | [ticket/14781] Add core event to the function group_user_attributes() | rxu | 2016-09-12 | 1 | -1/+23 |
| | | | | | | | | | | | | | PHPBB3-14781 | ||||
