Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jamesflorentino/nanoScrollerJS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Foliotek/nanoScrollerJS
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 6 commits
  • 26 files changed
  • 2 contributors

Commits on Aug 15, 2017

  1. Update Gruntfile.coffee

    @thedustinsmith
    thedustinsmith authored Aug 15, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    29f7a5c View commit details

  2. move bin to dist for IIS purposes

    @thedustinsmith
    thedustinsmith committed Aug 15, 2017
    Copy the full SHA
    2569cf2 View commit details

  3. package casing

    @thedustinsmith
    thedustinsmith committed Aug 15, 2017
    Copy the full SHA
    547a8dd View commit details

Commits on Nov 21, 2017

  1. Update jquery.nanoscroller.js

    @thedustinsmith
    thedustinsmith authored Nov 21, 2017
    Copy the full SHA
    23f04b5 View commit details

Commits on Dec 19, 2017

  1. Revert changes from nanoscroller repo 

    This comes from nanoscrollerJS repo #255
    @thedustinsmith
    thedustinsmith authored Dec 19, 2017
    Copy the full SHA
    6953c89 View commit details

Commits on Oct 1, 2018

  1. hide the pane

    Dustin Smith authored Oct 1, 2018
    Copy the full SHA
    1612ee3 View commit details
6 changes: 3 additions & 3 deletions Gruntfile.coffee
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ module.exports = (grunt) ->

dirs:
coffeeDir: 'coffeescripts'
jsDir: 'bin/javascripts'
cssDir: 'bin/css'
jsDir: 'dist/javascripts'
cssDir: 'dist/css'
testDir: 'tests'

pkg: grunt.file.readJSON('nanoscroller.jquery.json')
@@ -72,7 +72,7 @@ module.exports = (grunt) ->
version: '<%= pkg.version %>'
url: '<%= pkg.homepage %>'
options:
paths: 'bin/javascripts'
paths: '<%= dirs.jsDir %>',
outdir: 'docs/'

csslint:
Loading