Merged
Conversation
…nto feature/app
…nto feature/app
…nto feature/app # Conflicts: # Gruntfile.js
…nto feature/app
…nto feature/app
…nto feature/assistant
KingYes
requested changes
Sep 20, 2018
.eslintrc.js
Outdated
| 'no-eval': 'error', | ||
| 'no-fallthrough': 'error', | ||
| 'no-multiple-empty-lines': [ 'error', { max: 1 } ], | ||
| 'no-multiple-empty-lines': [ 'warn', { max: 1 } ], |
KingYes
requested changes
Sep 20, 2018
assets/dev/js/editor/editor.js
Outdated
| this.initHotKeys(); | ||
|
|
||
| this.initEnvData(); | ||
| this.hotkeysModal = new HotkeysModal(); |
assets/dev/js/frontend/frontend.js
Outdated
| var ElementorFrontend = function() { | ||
| var self = this, | ||
| dialogsManager; | ||
| var self = this; |
|
|
||
| @import "../helpers/direction"; | ||
|
|
||
| @import "../../../../core/common/assets/scss/common"; No newline at end of file |
includes/user.php
Outdated
|
|
||
| public static function register_ajax_actions() { | ||
| Plugin::$instance->ajax->register_ajax_action( 'introduction_viewed', [ __CLASS__, 'set_introduction_viewed' ] ); | ||
| /** @var \Elementor\Core\Common\Modules\Ajax\Module $ajax */ |
…nto feature/app # Conflicts: # assets/dev/js/frontend/frontend.js
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
PR Checklist
PR Type
What kind of change does this PR introduce?
Summary
This PR can be summarized in the following changelog entry:
Description
An explanation of what is done in this PR
Test instructions
This PR can be tested by following these steps:
Quality assurance
Fixes #