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: numenta/htm.java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: sambitgaan/htm.java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 21 files changed
  • 1 contributor

Commits on Feb 7, 2015

  1. Did some changes to the POM and GRADLE file as the required libraries… 

    … did not load. Also added the libraries to the eclipse library so that ecplise project should not complain about missing libraries.
    @sambitgaan
    sambitgaan committed Feb 7, 2015
    Configuration menu
    Copy the full SHA
    a57de39 View commit details
    Browse the repository at this point in the history

  2. Added log4j jar into dependency list and eclipse library as at runtim… 

    …e this library is needed.
    @sambitgaan
    sambitgaan committed Feb 7, 2015
    Configuration menu
    Copy the full SHA
    7114b1b View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2015

  1. As per suggestion reverted the GRADLE and POM fime. Also modified the… 

    … eclipse libs folder.
    @sambitgaan
    sambitgaan committed Feb 8, 2015
    Configuration menu
    Copy the full SHA
    820cffb View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2015

  1. Commiting changes

    @sambitgaan
    sambitgaan committed Feb 14, 2015
    Configuration menu
    Copy the full SHA
    bc67596 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	libs/slf4j-api-1.7.10.jar
    @sambitgaan
    sambitgaan committed Feb 14, 2015
    Configuration menu
    Copy the full SHA
    0c633de View commit details
    Browse the repository at this point in the history

  3. Added the slf4j-api jar again

    @sambitgaan
    sambitgaan committed Feb 14, 2015
    Configuration menu
    Copy the full SHA
    37fa3b9 View commit details
    Browse the repository at this point in the history

  4. Auto formating by Eclipse

    @sambitgaan
    sambitgaan committed Feb 14, 2015
    Configuration menu
    Copy the full SHA
    10be882 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2015

  1. Adding the jmh library to the libs folder

    @sambitgaan
    sambitgaan committed Feb 15, 2015
    Configuration menu
    Copy the full SHA
    9cd5cfa View commit details
    Browse the repository at this point in the history

  2. =====================================================================… 

    …============

:check
SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
==================================================================================

Added slf4j-simple library to solve the above error in my depot.
This error was caused when running the gradle check.
    @sambitgaan
    sambitgaan committed Feb 15, 2015
    Configuration menu
    Copy the full SHA
    2403934 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2015

  1. Merge remote-tracking branch 'upstream/master'

    @sambitgaan
    sambitgaan committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    80fe558 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2015

  1. Merge remote-tracking branch 'upstream/master'

    @sambitgaan
    sambitgaan committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    4a6d694 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2015

  1. Merge remote-tracking branch 'upstream/master'

    @sambitgaan
    sambitgaan committed May 25, 2015
    Configuration menu
    Copy the full SHA
    147833a View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2015

  1. Merging my change

    @sambitgaan
    sambitgaan committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    ac76379 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2016

  1. Merge remote-tracking branch 'upstream/master'

    @sambitgaan
    sambitgaan committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    97d2c5c View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2017

  1. Updating after a long time

    @sambitgaan
    sambitgaan committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    cbb3be8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/numenta/htm.java 

    # Conflicts:
#	build.gradle
#	pom.xml
#	src/main/java/org/numenta/nupic/algorithms/SpatialPooler.java
    @sambitgaan
    sambitgaan committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    05bd1b4 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2017

  1. Resolved conflicts

    @sambitgaan
    sambitgaan committed Dec 31, 2017
    Configuration menu
    Copy the full SHA
    f3c68b4 View commit details
    Browse the repository at this point in the history
Loading