Commits

Commit history

1. Commits on Feb 10, 2015

   • Merge branch 'bsjsRestructure' of https://github.com/ecologylab/BigSemanticsJavaScript into bsjsRestructure

     adunofaiur

     committed
     2e95721View commit details

     Copy full SHA for 2e95721

     Browse repository at this point

   • merging

     adunofaiur

     committed
     92b65bfView commit details

     Copy full SHA for 92b65bf

     Browse repository at this point
2. Commits on Feb 9, 2015

   • Merge branch 'bsjsRestructure' of https://github.com/ecologylab/BigSemanticsJavaScript into bsjsRestructure

     ajitjain

     committed
     8b6a9dfView commit details

     Copy full SHA for 8b6a9df

     Browse repository at this point

   • fix twitterMice merging issues + typos

     ajitjain

     committed
     79e52ffView commit details

     Copy full SHA for 79e52ff

     Browse repository at this point

   • safer line rendering

     keithkade

     committed
     37299d3View commit details

     Copy full SHA for 37299d3

     Browse repository at this point

   • merged in changes to extraction

     adunofaiur

     committed
     805a290View commit details

     Copy full SHA for 805a290

     Browse repository at this point

   • faviconFix

     adunofaiur

     committed
     ef4ff29View commit details

     Copy full SHA for ef4ff29

     Browse repository at this point

   • Merge branch 'bsjsRestructure' of https://github.com/ecologylab/BigSemanticsJavaScript into bsjsRestructure

     ajitjain

     committed
     1891ab0View commit details

     Copy full SHA for 1891ab0

     Browse repository at this point

   • resolve merge conflicts

     ajitjain

     committed
     c04a5b8View commit details

     Copy full SHA for c04a5b8

     Browse repository at this point

   • Deleted part of old project that accidentally got moved forward

     adunofaiur

     committed
     d29cbefView commit details

     Copy full SHA for d29cbef

     Browse repository at this point

   • resolve restructure / merge issues

     ajitjain

     committed
     e1dc3a2View commit details

     Copy full SHA for e1dc3a2

     Browse repository at this point

   • Merge branch 'master' of https://github.com/ecologylab/BigSemanticsJavaScript

     keithkade

     committed
     6b76273View commit details

     Copy full SHA for 6b76273

     Browse repository at this point

   • secondary extraction is now integrated. commented out until further testing. also style improvements throughout

     keithkade

     committed
     26803e8View commit details

     Copy full SHA for 26803e8

     Browse repository at this point

   • Solved some poorly-merged files

     adunofaiur

     committed
     4d97316View commit details

     Copy full SHA for 4d97316

     Browse repository at this point

   • updated comments

     adunofaiur

     committed
     dc597e8View commit details

     Copy full SHA for dc597e8

     Browse repository at this point

   • Merge branch 'bsjsRestructure' of https://github.com/ecologylab/BigSemanticsJavaScript into bsjsRestructure

     adunofaiur

     committed
     633cd04View commit details

     Copy full SHA for 633cd04

     Browse repository at this point

   • removed unused files

     adunofaiur

     committed
     3a1bab4View commit details

     Copy full SHA for 3a1bab4

     Browse repository at this point

   • Deleted ICE from bsjs core

     adunofaiur

     committed
     cf3c4fcView commit details

     Copy full SHA for cf3c4fc

     Browse repository at this point

   • removed merge issues

     adunofaiur

     committed
     cb980e9View commit details

     Copy full SHA for cb980e9

     Browse repository at this point

   • delted metadataExtractor, which was causing issues

     adunofaiur

     committed
     5569828View commit details

     Copy full SHA for 5569828

     Browse repository at this point

   • metadataloader double bugs ironed out a bit

     adunofaiur

     committed
     4e12025View commit details

     Copy full SHA for 4e12025

     Browse repository at this point

   • merge error fix

     adunofaiur

     committed
     27c840eView commit details

     Copy full SHA for 27c840e

     Browse repository at this point
3. Commits on Feb 8, 2015

   • Whoops, deleting extra stuff.

     adunofaiur

     committed
     ec7385aView commit details

     Copy full SHA for ec7385a

     Browse repository at this point

   • Whoops, deleting extra stuff.

     adunofaiur

     committed
     73f423cView commit details

     Copy full SHA for 73f423c

     Browse repository at this point

   • Restructure done! Well, close at least.

     adunofaiur

     committed
     9784250View commit details

     Copy full SHA for 9784250

     Browse repository at this point
4. Commits on Feb 6, 2015

   • revert back extension description

     

     ajit jain

     committed
     fdc7124View commit details

     Copy full SHA for fdc7124

     Browse repository at this point

   • removed csome things

     adunofaiur

     committed
     9542e53View commit details

     Copy full SHA for 9542e53

     Browse repository at this point

   • sd

     adunofaiur

     committed
     afa701dView commit details

     Copy full SHA for afa701d

     Browse repository at this point

   • sdnjnasdnasnd

     adunofaiur

     committed
     53666f8View commit details

     Copy full SHA for 53666f8

     Browse repository at this point

   • updated

     adunofaiur

     committed
     5c1747dView commit details

     Copy full SHA for 5c1747d

     Browse repository at this point

   • tweet bubble work, at least locally

     adunofaiur

     committed
     eb80958View commit details

     Copy full SHA for eb80958

     Browse repository at this point
5. Commits on Feb 5, 2015

   • smarter recursion and checking for inherited values

     keithkade

     committed
     945e933View commit details

     Copy full SHA for 945e933

     Browse repository at this point

   • finished expand/show categories on click

     keithkade

     committed
     229ec34View commit details

     Copy full SHA for 229ec34

     Browse repository at this point

   • first steps to expand/collapse categories on click. work in progress

     keithkade

     committed
     f5d8f3aView commit details

     Copy full SHA for f5d8f3a

     Browse repository at this point

   • physics tweak

     keithkade

     committed
     ab24993View commit details

     Copy full SHA for ab24993

     Browse repository at this point