Skip to content

Drupal 7.54#70

Merged
generalredneck merged 31 commits intomasterfrom
drupal-7.54
Jun 23, 2017
Merged

Drupal 7.54#70
generalredneck merged 31 commits intomasterfrom
drupal-7.54

Conversation

@ccjjmartin
Copy link
Contributor

Purpose:

  • Drupal 7.54

Drupal Core Diff:

stefanruijsenaars and others added 30 commits October 5, 2016 20:49
7.52 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc
…: $form['#token'] = FALSE in custom form always causes validation error for anonymous users
…, tory-w: Fixed that newer Chrome versions cannot drag and drop anymore on desktop after 7.51 update when jQuery is updated to 1.7-1.11.0
… Watchdog logging of all searches is performance hit; need ability to turn it off (7.x)
…un, cebasqueira: Make CommentHelperCase support $modules like DrupalWebTestCase and make CommentNodeAccessTest use that
7.53 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc
…thia: theme_menu_tree() removes helpful data for theming custom menu trees
…validating number with decimal point but no decimal numbers
… language prefix (global $language_url is not reset in tests)
…, billywardrop: Non-collapsible fieldsets within collapsed fieldsets have "expanded" icon
…type not validating number with decimal point but no decimal numbers
…/config/regional/date-time does not show the correct default format for short and medium format
…the parameters of hook_options_list() to options_list_callback
… File validation error message not removed after subsequent upload of valid file
…d on stream wrappers not implemented by Drupal
…ass all the parameters of hook_options_list() to options_list_callback"

This reverts commit ffe9f91.
…g, rooby, billywardrop: Non-collapsible fieldsets within collapsed fieldsets have "expanded" icon"

This reverts commit 6fa7f7a.
* commit '986185c49bfecad6dfce7b6df81b325486585d9e': (28 commits)
  Drupal 7.54
  Various fixes to CHANGELOG.txt in preparation for the 7.54 release.
  Revert "Issue #1361810 by cr0ss, David_Rothstein, rlmumford, oriol_e9g, rooby, billywardrop: Non-collapsible fieldsets within collapsed fieldsets have "expanded" icon"
  Revert "Issue #1621356 by oriol_e9g, joachim, tim.plunkett, dsdeiz: Pass all the parameters of hook_options_list() to options_list_callback"
  Issue #878284 by jp.stacey: cache_set documentation should make lifetime clearer
  Issue #2107287 by BR0kEN: PHP 5.4 calls a new stream_metadata() method on stream wrappers not implemented by Drupal
  Issue #1792032 by aerozeppelin, bjorpe, lmeurs, ndobromirov, balsama: File validation error message not removed after subsequent upload of valid file
  Issue #1884830 by pwolanin, dcam: Regression - replace md5 in Filter module calls with sha2 hashes
  Issue #1621356 by oriol_e9g, joachim, tim.plunkett, dsdeiz: Pass all the parameters of hook_options_list() to options_list_callback
  Issue #2637552 by vmachado, Fabianx: Use the drupal_static_fast pattern in drupal_html_id()
  Issue #1817748 by markpavlitski, hgoto, wavesailor, Sophie.SK: /admin/config/regional/date-time does not show the correct default format for short and medium format
  Issue #2494221 by david_garcia, dagmar: Slow Log/Watchdog clear when there are lots of data
  Updated: Issue #2042411 by aerozeppelin, generalredneck: Float field type not validating number with decimal point but no decimal numbers
  Issue #1361810 by cr0ss, David_Rothstein, rlmumford, oriol_e9g, rooby, billywardrop: Non-collapsible fieldsets within collapsed fieldsets have "expanded" icon
  Issue #2724773 by Stevel: Translation tests fail on site with english language prefix (global $language_url is not reset in tests)
  Issue #2779379 by sandip27: Minor Coding Standard Issue in color.test file
  Issue #2838650 by er.pushpinderrana: menu_cache_clear description contains duplicate word: cached cached
  Issue #2042411 by aerozeppelin, generalredneck: Float field type not validating number with decimal point but no decimal numbers
  Issue #767404 by das-peter, geru, Ketan Harit, nikhilsukul, Nitesh Sethia: theme_menu_tree() removes helpful data for theming custom menu trees
  Issue #2821203 by plach: Factor out logic to detect HTTPS requests into an API function
  ...
@ccjjmartin
Copy link
Contributor Author

If we want to keep the PR diff clean we can change the base branch to something else and change it back after merging the 7.53 PR.

@ccjjmartin ccjjmartin self-assigned this Apr 3, 2017
@ccjjmartin ccjjmartin changed the base branch from master to drupal-7.53 June 21, 2017 23:18
@ccjjmartin ccjjmartin changed the base branch from drupal-7.53 to master June 21, 2017 23:18
Copy link
Contributor

@generalredneck generalredneck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@generalredneck generalredneck merged commit baf7e93 into master Jun 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants