Pre-Alpha Release(s) 14.0.2-14.0.4 > Beta - #1497
Open
briankalwat wants to merge 827 commits into
Open
Conversation
… to consolidated DueSoonCounts and OverdueCounts merge field into the ConnectionRequestCounts merge field.
…values correctly when opened in auto-edit mode, which could result in those values being cleared when the group was saved.
… the HighlightDetailColumn, and updated the column so its per-column filter searches both the title and detail.
…en creating obsidian list blocks.
# Conflicts: # Rock.JavaScript.Obsidian/Framework/SystemGuids/serviceJob.ts # Rock.Version/AssemblySharedInfo.cs
… cause the grid to not properly update when scrolling vertically on small devices. (Fixes SparkDevNetwork#6839)
# Conflicts: # Directory.Build.props
…values correctly when opened in auto-edit mode, which could result in those values being cleared when the group was saved. (cherry picked from commit 1e9327c)
…ubmission List and Form Analytics to Obsidian, and added Confirmation Email Both, Notification Email multi-address, and Connection Requests automations.
… header and deactivation confirmation, other fixes.
…non-US address verification and optional geocoding. Requires a Smarty subscription for 'International Address Verification' or, if using geocoding, 'International Geocoding'.
…eing logged when the viewer connected over IPv6. (Fixes SparkDevNetwork#6843)
…ion-related blocks, ensuring they open with a clean route instead of an unsightly query-string URL, by standardizing the communication blocks on the single, longstanding "CommunicationId" page parameter.
…ion-related blocks, ensuring they open with a clean route instead of an unsightly query-string URL, by standardizing the communication blocks on the single, longstanding "CommunicationId" page parameter.
# Conflicts: # Rock.Blocks/Communication/CommunicationList.cs
…ng included in Universal Search results after a bulk re-index, and restored the missing "Indexing Enabled" option in the Attributes block so Attributes can be flagged for indexing. (Fixes SparkDevNetwork#6857)
…s each request's prayer comments with a single efficient query. Ref: 2635df6
…ock by widening it to fit the maximum possible exception Id.
…f any remaining legacy Azure Blob Storage usage to the core Azure Blob Storage provider, including BinaryFile rows whose StorageEntitySettings still reference the legacy keys, and then deactivates the legacy provider.
…-day events like camps, retreats, and mission trips can be entered as days rather than total hours.
…on's (or spouse's) email address when the optional Email field was left blank on submission. (Fixes SparkDevNetwork#6861)
# Conflicts: # Rock/Attribute/Helper.cs # Rock/Model/Core/AttributeValue/AttributeValue.SaveHook.cs
Pre-Alpha Release(s) 20.0.2-4 > Beta Rock
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Notice
In case you are submitting a non bug-fix-PR, we highly recommend you to engage in a PR discussion first.
There are many factors we consider before accepting a pull request. This includes:
With the PR discussion we can assess your proposed changes before you start working on it so that we can come up with the best possible approach to it. This may include:
Proposed Changes
Fixes: #
Types of changes
What types of changes does your code introduce to Rock?
Put an
xin the boxes that applyChecklist
Put an
xin the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.Further comments
Documentation
Migrations
If your pull request requires a migration, please exclude the migration from the Rock.Migration project, but submit it with your pull request. Please add a note to your pull request that provides a heads up that a migration file is present.