aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
2019-03-11Merge branch 'master' into hannah_linkingbob
2019-03-11fixed drag drop of documentsbob
2019-03-11cleanupbob
2019-03-11got rid of computed mainContent...?bob
2019-03-11Merge branch 'master' of https://github.com/browngraphicslab/Dash-Webbob
2019-03-11added marquee selection.bob
2019-03-11Merge pull request #47 from browngraphicslab/uploadtschicke-brown
2019-03-11minor fix to divider draggerbob
2019-03-11selection marquee without selectionbob
2019-03-11DONEHannah Chow
2019-03-10fixed pdf bugHannah Chow
2019-03-10merggingHannah Chow
2019-03-10almost doneHannah Chow
2019-03-10fixed type of FormattedTextBox to RichTextFieldBob Zeleznik
2019-03-10fixed issue with typing into an existing note in an embedded collectionBob Zeleznik
2019-03-09audio and video upload workingMonika Hedman
2019-03-09before big changesMonika Hedman
2019-03-09about to mergeMonika Hedman
2019-03-09merge againMonika Hedman
2019-03-09merged with masterMonika Hedman
2019-03-09Update CollectionView.tsxtschicke-brown
2019-03-09image uploadingMonika Hedman
2019-03-09Merge branch 'master' into audiovideoandrewdkim
2019-03-09added audio and video nodesAndrew Kim
2019-03-08diff lists to avoid rendering everything in a colletion free form view when a...bobzel
2019-03-08testingbob
2019-03-08fixed network updating of inkbob
2019-03-08bug fixes and hack to make context menu appear againbob
2019-03-08working version of pdfs with annotations.bob
2019-03-08merged with masterbob
2019-03-08Merge branch 'master' into PDFNodebob
2019-03-08Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into im...yipstanley
2019-03-07Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into in...yipstanley
2019-03-07fixes/changesyipstanley
2019-03-07Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-WebTyler Schicke
2019-03-07Fixed websocket pathTyler Schicke
2019-03-07fixed flicker when activating a PDFbob
2019-03-07following the linkHannah Chow
2019-03-07cleaned up PDF render and fixed dragging to show annotations.Bob Zeleznik
2019-03-07yeetHannah Chow
2019-03-07added source or destination document labellingHannah Chow
2019-03-07delete workingHannah Chow
2019-03-07added image caching for pdfsBob Zeleznik
2019-03-06eraser works on click and dragFawn
2019-03-06all inking codeFawn
2019-03-06fixed render size of pdfs & changed note backrounds contextually.bob
2019-03-06from lastbob
2019-03-06fixed to work analogous to imagesbob
2019-03-06simple linking doneHannah Chow
2019-03-06Merge branch 'master' into PDFNodebob