search

sfu-natlang / lensingwikipedia

Lensing Wikipedia is an interface to visually browse through human history as represented in Wikipedia. This the source code that runs the website:
http://lensingwikipedia.cs.sfu.ca
Other
11 stars 4 forks source link

Smoothed timeline #127

Closed avacariu closed 9 years ago

avacariu commented 9 years ago

If the cluster view conflicts with this, I'll fix it and update this pull request after that's merged.

anoopsarkar commented 9 years ago

should we merge this pull request before the tSNE merge? Jasneet?

KonceptGeek commented 9 years ago

Yeah we can merge it as I haven't touched timeline.js. Also the tSNE branch is almost ready to be merged. I've already merged master into tSNE branch to resolve conflicts and I'm just testing if everything is working and updating the website.md.

anoopsarkar commented 9 years ago

Andrei: did you merge with current master after story line merge? also: any changes to backend?

avacariu commented 9 years ago

Yeah, I merged master a few hours ago. And no, there's no changes to the backend.

anoopsarkar commented 9 years ago

ok. let's merge timeline before tSNE.

and Happy New Year!