This repository was archived by the owner on Nov 25, 2020. It is now read-only.
Conversation
Conflicts: gulpfile.coffee
Conflicts: gulpfile.coffee playground/main.coffee playground/main.styl src/core/kd.coffee
we do the necessary check on windowController not necessary to pollute prototype
… wasn't used anywhere
Merging this so that I can keep working
Contributor
|
👍 but maybe we should fix the tests first? |
Contributor
|
tests fixed at #80 please merge that PR first before merging this. |
Tests: add require statement for underscore
Contributor
There was a problem hiding this comment.
This hunk's context was different in master branch. I'll merge master and resolve the conflict.
….listview Conflicts: src/components/buttons/buttonview.coffee
szkl
force-pushed
the
master.listview
branch
from
1a26b21 to
168dda4
Compare
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
8 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.
This has many improvements over master, i think it is time to merge these two. cc/ @szkl @gokmen @fatihacet @burakcan @usirin