Update process tweaks #450
Closed
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
Conflicts: includes/admin.php
Conflicts: includes/admin.php
Add license-remove functionality Tweak UI Add loading spinner for ajax operations
Conflicts: readme.md readme.txt
Conflicts: ui/admin.css
…connect to premium
…ckage urls correctly
- CSS is for making the video container responsive
|
@shadyvb Looks like there are some conflicts to be resolved before merging. |
Conflicts: includes/admin.php ui/admin.css
|
@fjarrett Voila! |
| load : function() { | ||
| var template = $('.theme-wrap'); | ||
| var overlay = $('.theme-overlay'); | ||
| var ext_obj = stream_extensions.extensions; |
There was a problem hiding this comment.
@shadyvb ui/extensions.js: line 14, col 28, 'stream_extensions' is not defined.
There was a problem hiding this comment.
@fjarrett It's defined in the call to wp_localize_script() in https://github.com/x-team/wp-stream/pull/450/files#diff-7eec5692b9fd9edd9bf006170f5ce1edR481
There was a problem hiding this comment.
@c3mdigital Travis is flagging it: https://travis-ci.org/x-team/wp-stream/jobs/23701716#L240
|
This has been merged into #451 and will be handled there. Closing. |
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.