Angular and Playlists only (resolved) #52
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
…into angular-merge Conflicts: public/js/app.js views/index.jade
…into angular-merge
…into angular-merge
…into angular-merge Conflicts: public/js/app.js
…into angular-merge Conflicts: public/js/app.js soundtrack.js
…into angular-merge
…ve modals from index jade, reorganize controllers a little more
…into angular-merge
…into angular-merge Conflicts: public/js/app.js
Conflicts: soundtrack.js
…p more compatible, settings to toggle mentions and link targets, chat mention beep is now tied to player volume level, new settings dialog/controller that stores in localStorage, setting button in header bar
Conflicts: public/js/app.js soundtrack.js views/index.jade views/layout.jade views/partials/message.jade
|
Alright I updated the initial request to include the proper data for a pageload. It definitely decreases perceived load time. |
…ular-merged Conflicts: public/js/app.js soundtrack.js views/layout.jade
|
This is awesome. I'll bounce another pull request to your repo sometime this coming week to smooth out the rest of the playlist and importing features as intended. P.S.: I've been pointing to this as a reference example for other projects for a while. Great work! |
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.
Here's a new pull for the angular branch. I've resolved all the merge conflicts with master.
I haven't changed anything in regards to the comments here yet, we probably want to do that before pushing since its an easy change, but its your call.
For an example of this running correctly please see this