683 welcome page after sign up #881
Merged
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
added 5 commits
April 4, 2014 09:24
because we need now the show for a page after signup the landing_page will now home#index
using locales for complete content
| @@ -8,4 +8,12 @@ def power_error(exception) | |||
| redirect_to :edit_user_registration, :flash => {:error => exception.message} | |||
| end | |||
|
|
|||
| def after_inactive_sign_up_path_for(resource) | |||
| raise resource.inspect | |||
There was a problem hiding this comment.
This should probably not be merged.
added 2 commits
May 8, 2014 08:17
| .row | ||
| .col-md-12 | ||
| %h3=t("signup.need_help") | ||
| =simple_format t("signup.wiki", link: link_to("Wiki", "http://wiki.ontohub.org/", target: "_blank")) |
There was a problem hiding this comment.
At End of File there should be a newline. Please rebase this.
This is according to POSIX.
added 2 commits
May 9, 2014 10:24
Conflicts: config/locales/en.yml
|
👍 |
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.
No description provided.