aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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/14830] Fix FORM_INVALID error during some ACP setting operations
| | * [ticket/14823] Move check_form_key() inside actual save data stepMarc Alexander2016-10-281-5/+5
| | | | | | | | | | | | PHPBB3-14823
| | * [ticket/14830] Fix FORM_INVALID error on cpf settings changingrxu2016-10-241-1/+1
| | | | | | | | | | | | PHPBB3-14830
| | * [ticket/14830] Fix FORM_INVALID error during AСP search index deletionrxu2016-10-211-1/+1
| | | | | | | | | | | | PHPBB3-14830
| | * [ticket/14830] Fix FORM_INVALID error on search backend changingrxu2016-10-211-5/+3
| | | | | | | | | | | | PHPBB3-14830
| | * [ticket/14830] Fix link hash checking caserxu2016-10-211-1/+1
| | | | | | | | | | | | PHPBB3-14830
| | * [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletionrxu2016-10-211-8/+5
| | | | | | | | | | | | PHPBB3-14830
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-241-7/+7
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14818] Optimize generate_board_url function
| * | Merge pull request #4487 from gmixo/patch-2Tristan Darricau2016-10-241-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 functionMIkhail Gulyaev2016-10-171-7/+7
| | | | | | | | | | | | | | | | if $config['force_server_vars'] no need to calculate $request
* | | | 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] Fix adding multiple form keys
| | * | [ticket/14827] Possibility to add multiple form keyskasimi2016-10-191-9/+11
| | | | | | | | | | | | | | | | PHPBB3-14827
| * | | 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
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14802] Add test for empty/blank lines in poll options [ticket/14802] Empty/blank lines should not be additional poll options
| * | | Merge pull request #4471 from dsinn/ticket/14802Tristan Darricau2016-10-031-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 optionsDaniel Sinn2016-09-291-1/+1
| | | |/ | | |/| | | | | | | | | PHPBB3-14802
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-023-13/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14789] Remove obsolete check_form_key() and add missing hashes [ticket/14789] Move form key checks to where they actually do something
| * | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-10-023-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 hashesMarc Alexander2016-09-302-7/+8
| | | | | | | | | | | | | | | | PHPBB3-14789
| | * | [ticket/14789] Move form key checks to where they actually do somethingMarc Alexander2016-09-302-11/+26
| | |/ | | | | | | | | | PHPBB3-14789
* | | 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
| |/ | | | | | | PHPBB3-14795
| * [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 support * Senky/ticket/10809: [ticket/10809] Reflect MSSQL removal in docs files [ticket/10809] Remove MSSQL support
| * | [ticket/10809] Remove MSSQL supportJakub Senko2016-08-025-6/+0
| | | | | | | | | | | | PHPBB3-10809
* | | 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 extensions
| | * | [ticket/13709] Add fallback for email templates used by extensionsOliver Schramm2016-08-211-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a fallback to english for the core like we do it in $user->add_lang() PHPBB3-13709
* | | | Merge pull request #4459 from rxu/ticket/14794Marc Alexander2016-09-231-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibility
| * | | | [ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibilityrxu2016-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14794
* | | | | [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+rxu2016-09-221-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-14793
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-188-16/+110
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14789] Add form tokens to tests and uncomment add_form_key [ticket/14789] Add link hashes and form tokens to all acp links/buttons
| * | | [ticket/14789] Add form tokens to tests and uncomment add_form_keyMarc Alexander2016-09-181-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14789
| * | | [ticket/14789] Add link hashes and form tokens to all acp links/buttonsMarc Alexander2016-09-188-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 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()
| | * | | [ticket/14781] Add core event to the function group_user_attributes()rxu2016-09-121-1/+23
| | | | | | | | | | | | | | | | | | | | PHPBB3-14781
* | | | | 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 3.1.x New UCP hooks for subscriptions
| | * | | | [ticket/14638] Rollback changes from 3.2.x versionWesley Fok2016-08-031-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mistakenly brought in the modified 3.2.x version verbatim instead of diffing against the 3.1.x version of ucp_main.php. Removed any changes I didn't explicitly make. PHPBB3-14638
| | * | | | Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.xWesley Fok2016-08-0311-25/+183
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | [ticket/14638] New UCP hooks for subscriptionsWesley Fok2016-08-031-15/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds various event hooks to the Manage subscriptions page of the User Control Panel. core.ucp_subscribed_post_data allows us to handle additional post data from the form that unwatches subscriptions. core.ucp_main_subscribed_forums_modify_query, core.ucp_main_topiclist_count_modify_query and core.ucp_main_topiclist_modify_query all modify the queries used to get the list of subscribed forums and subscribed/bookmarked topics. core.ucp_main_subscribed_forum_modify_template_vars and core.ucp_main_topiclist_topic_modify_template_vars modify the template variable array associated with each subscribed forum and topic row. This is a backport to 3.1.x of the code in PR #4318. PHPBB3-14638
* | | | | | 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 lists
| | * | | | [ticket/14738] Add core events to improve modifying forum listsrxu2016-08-073-11/+59
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-14738
* | | | | Merge pull request #4440 from danchr/ticket/14774Tristan Darricau2016-09-111-43/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14774] Support partial downloads of attachments * danchr/ticket/14774: [ticket/14774] Support partial downloads of attachments
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 02:53:45 +0000