Fix for #162 custom css-class for all selects in backend added and jquery-selector mo... #191
Conversation
This file contains 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
…nt in single essence pictures.
Known issues: Defaults for show picture routes not working anymore.
…ext_stable Conflicts: alchemy_cms.gemspec app/assets/stylesheets/alchemy/buttons.css.scss app/models/alchemy/picture.rb
Gemspec fleximage with path spec
jquery-rails version bumped to 2.0.0 for rails 3.2.1
Deleted deprecations from rails 3.2.1 update (spec. format and handler in names)
… modified so another selectbox-plugin can be used
|
This trips me out all the time. I dont't have a clue either. No problem I just cherry pick the commits from your next_stable branch. To get the branches back in sync you could rename them and pull the branches from our remote. then delete your old branches. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Sorry, I give up. Spent 4 Hours trying to rebase, merge, cherry-pick... Don't know what exactly went wrong here and why our master-branches are so out of sync.
If you got a hint for me please let me know and I am willing to spend another hour. Otherwise please just cherry-pick the last two commits...