Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixes #9614 ] Extend the setting.py property to support the default expanded/collapsed state to the Timeline plugin #9615

Merged
merged 1 commit into from
Jul 7, 2022

Conversation

DavidQuartz
Copy link
Member

@DavidQuartz DavidQuartz commented Jul 6, 2022

References: #9614

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates
  • Commits adding new texts do use gettext and have updated .po / .mo files (without location infos)

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

@DavidQuartz DavidQuartz added backport 3.3.x PR should be backported to target version 3.3.x labels Jul 6, 2022
@DavidQuartz DavidQuartz requested a review from allyoucanmap July 6, 2022 11:02
@DavidQuartz DavidQuartz self-assigned this Jul 6, 2022
@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Jul 6, 2022
@DavidQuartz DavidQuartz requested a review from afabiani July 6, 2022 11:11
@afabiani afabiani added this to the 4.0.0 milestone Jul 7, 2022
@afabiani afabiani merged commit af05de0 into 3.3.x Jul 7, 2022
@afabiani afabiani deleted the timeline_expanded_settings branch July 7, 2022 06:32
@github-actions
Copy link
Contributor

github-actions bot commented Jul 7, 2022

The backport to 3.3.x failed:

The process 'git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.3.x 3.3.x
# Navigate to the new working tree
cd .worktrees/backport-3.3.x
# Create a new branch
git switch --create backport-9615-to-3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick af05de09737fed472f8e0168ab5715e4f4a80faa
# Push it to GitHub
git push --set-upstream origin backport-9615-to-3.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.3.x

Then, create a pull request where the base branch is 3.3.x and the compare/head branch is backport-9615-to-3.3.x.

@afabiani
Copy link
Member

afabiani commented Jul 7, 2022

@DavidQuartz automatic backport to 3.3.x is failed

@DavidQuartz
Copy link
Member Author

@afabiani the backport label was not needed in the first place since the merge is already into 3.3.x

@DavidQuartz DavidQuartz removed the backport 3.3.x PR should be backported to target version label Jul 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.3.x cla-signed CLA Bot: community license agreement signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants