aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 '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
* | [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 #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
* | [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 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 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 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
* | | [ticket/12133] fix download file names for WebKit-derived browsersDan Villiom Podlaski Christiansen2016-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All browser engines that descend from WebKit declare themselves as Safari in the user agent, including Chrome. Currently, the code assumes that any Safari-like browser cannot handle the RFC-compliant filename syntax. At least for recent versions of Safari, this is no longer the case, and the legacy syntax results in URI-quoted filenames. Using the standard syntax works as expected in both Safari 9 and Chrome 45. The ticket reporting this issue is from January 2014, so we can safely ignore compatibility: any browser still relying on the previous behaviour is unlikely to receive security updates. PHPBB3-12133
* | | [ticket/14673] Changes wrong language variable in mcp_forumCrizzo2016-08-221-1/+1
| | | | | | | | | | | | PHPBB3-14673
* | | [ticket/12925] Pluralize permanent delete checkbox labelJakub Senko2016-08-151-8/+10
|/ / | | | | | | PHPBB3-12925
* | [ticket/14721] Avoid renaming deleted usersOliver Schramm2016-08-011-7/+17
| | | | | | | | PHPBB3-14721
* | [ticket/14713] Add core event to the admin function get_forum_list()rxu2016-07-171-1/+11
| | | | | | | | PHPBB3-14713
* | Merge pull request #4374 from TheKigen/ticket/14616Marc Alexander2016-07-161-9/+22
|\ \ | | | | | | | | | [ticket/14616] Fixed auto-prune failing on large forums
| * | [ticket/14616] Switch prune limit to sql_query_limit instead of sql_andMax Krivanek2016-07-061-7/+2
| | | | | | | | | | | | PHPBB3-14616
| * | [ticket/14616] Added comma expected by test scripts.Max Krivanek2016-07-011-1/+1
| | | | | | | | | | | | PHPBB3-14616
| * | [ticket/14616] Added prune_limit to event core.prune_sqlMax Krivanek2016-06-281-1/+11
| | | | | | | | | | | | PHPBB3-14616
| * | [ticket/14616] Removed misplaced tab.Max Krivanek2016-06-271-1/+1
| | | | | | | | | | | | PHPBB3-14616
| * | [ticket/14616] Fixed auto-prune failing on large forumsMax Krivanek2016-06-271-6/+14
| | | | | | | | | | | | PHPBB3-14616
* | | Merge pull request #4342 from Senky/ticket/14654Marc Alexander2016-07-071-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/14654] Change Imagemagick to ImageMagick
| * | | [ticket/14654] Change Imagemagick to ImageMagickJakub Senko2016-06-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14654
* | | | Merge pull request #4354 from Stanzilla/smtp_explainMarc Alexander2016-07-061-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
| * | | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server optionBenjamin Staneck2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help users trying to figure out why their mail config is not working when they forgot to use a protocol prefix. PHPBB3-14184
* | | | Merge pull request #4281 from rmcgirr83/ticket_13716Marc Alexander2016-06-192-0/+18
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13716] Check phpBB version against config version
| * | | | [ticket/13716] Fix verbosenessRichard McGirr2016-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13716
| * | | | [ticket/13716] Remove extraneous blank lineRMcGirr832016-04-051-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13716
| * | | | [ticket/13716] Check phpBB version against config versionRichard McGirr2016-04-052-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display a warning in the ACP if the version constant (files) does not match the phpbb_config version (often indicating that the database updates hasn't been run) PHPBB3-13716
* | | | | Merge pull request #4331 from Senky/ticket/13978Marc Alexander2016-06-191-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary
| * | | | | [ticket/13978] Add core.ucp_profile_modify_signature_sql_aryJakub Senko2016-05-241-0/+10
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-13978
* | | | | Merge pull request #4329 from Senky/ticket/14429Marc Alexander2016-06-191-0/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14429] Add core.obtain_users_online_string_before_modify
| * | | | | [ticket/14429] Add core.modify_users_online_string_modifyJakub Senko2016-05-271-0/+24
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14429
* | | | | Merge pull request #4316 from rmcgirr83/ticket_14630Marc Alexander2016-06-191-0/+28
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | [ticket/14630] Add event to modify pm message
| * | | | [ticket/14630] Rename core eventRichard McGirr2016-06-021-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14630
| * | | | [ticket/14630] Change event name and fix capitalizationRichard McGirr2016-05-161-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14630
| * | | | [ticket/14630] Add event to modify pm messageRichard McGirr2016-05-061-0/+28
| | |_|/ | |/| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-14630 PHPBB3-14630
* | | | [ticket/14626] Event core.make_jumpbox_modify_tpl_aryTobi Schäfer2016-06-131-4/+2
| | | | | | | | | | | | | | | | PHPBB3-14626