Skip to content

Conversation

@briankalwat
Copy link
Contributor

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:

  1. Whether or not the Rock system you run is a standard, main-line build. If it is not, there is a lower chance we will accept your request since it may impact some other part of the system you don't regularly use.
  2. Features that would be used by less than 80% of Rock organizations, or ones that don't match the goals of Rock.

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:

  1. Coming up with an alternate approach that does not involve changes to core.
  2. Advising how your proposed solution be done in a different way that is more efficient and consistent with the rest of the system.
  3. Have one of our core developers make the changes for you. This may be the case if the change involves intricate tasks like an EF migration or something similar.

Proposed Changes

Fixes: #

Types of changes

What types of changes does your code introduce to Rock?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality, which has been approved by the core team)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist

Put an x in 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.

  • This is a single-commit PR. (If not, please squash your commit and re-submit it.)
  • I verified my PR does not include whitespace/formatting changes -- because if it does it will be closed without merging.
  • I have read the Contributing to Rock doc
  • By contributing code, I agree to license my contribution under the Rock Community License Agreement
  • Unit tests pass locally with my changes
  • I have added any required unit tests or integration tests that prove my fix is effective or that my feature works
  • I have included updated language for the Rock Documentation (if appropriate)

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.

briankalwat and others added 30 commits April 10, 2023 22:47
Pre-Alpha 15.0.14 > Master
Cherry Picks to fix Ages > Alpha
Cherry Picks to fix Ages > Beta
Cherry Picks to fix Ages > Master
Post Attendance Cherry-Pick > Alpha
Post Attendance Cherry-Pick > Beta
Post Attendance Cherry-Pick > Master
…ns to record which DataView was persisted and how long it took.
Added Additional Logging Update Persisted DataViews Job > Alpha
Added Additional Logging Update Persisted DataViews Job > Beta
Added Additional Logging Update Persisted DataViews Job > Master
…lues when a persisted Schedule has been assigned to the Data View.
…tive and ready to be processed based on their processing interval.
Performance Cherry Picks > Alpha
Performance Cherry Picks > Beta
Performance Cherry Picks > Master
Updated giving-history lava template to support contribution statements for businesses
Changes for about and beliefs pages > Alpha
jonrob and others added 28 commits January 19, 2024 15:44
… run jobs as well as updating the status message

(cherry picked from commit aae4093)
Pre-Alphas 17.0.6-17.0.11 > Alpha
# Conflicts:
#	Rock/Jobs/UpdatePersistedDatasets.cs
KidSpring Evacuation Lava Templates and Theme Updates
KidSpring Evacuation Lava Template Changes > Alpha
…cting groups, locations and schedules based on past attendances.

(cherry picked from commit 6b4c2f1)
…cting groups, locations and schedules based on past attendances.

(cherry picked from commit 6b4c2f1)
Updated kidspring evac lava templates
…pha-sync

- Merged alpha over top of pre-alpha-release
@briankalwat briankalwat deleted the pre-alpha-sync branch April 15, 2024 14:39
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.