This repository has been archived by the owner on Nov 13, 2017. It is now read-only.
Integrate activity search #49
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
**Broken:** Main content no longer editable. Need to split input into constiuent blocks and deal w/ independantly. **Temp:** Kit template (public/templates/kit.html) is a temp fix till nunjucks templates for kits exists in mozilla/webmaker-kits
|
Steps to test:
|
| agenda = JSON.parse( agenda ); | ||
| ======= | ||
| var agenda = JSON.parse( $( '#kitAgenda' ).val().trim() ); | ||
| >>>>>>> integrate activity search |
There was a problem hiding this comment.
I think you committed a merge conflict.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This adds the ability to search for activities and select the ones you wish to use. Activities can be reordered + removed once selected.
This PR should be dealt w/ after pull #47
Fixes #25