aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-03-11Merge branch 'master' of https://github.com/browngraphicslab/Dash-WebBob Zeleznik
2019-03-11removed Docking optionBob Zeleznik
2019-03-11Merge pull request #58 from browngraphicslab/fixContextMenu2bobzel
2019-03-11added pan modifier keys for macbookBob Zeleznik
2019-03-11Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into fi...laurawilsonri
2019-03-11changed context menu so that it doesn't zoom in too much when screen width is...laurawilsonri
2019-03-11fixed marquee issues and got rid of captions for images.bob
2019-03-11fixed dragging of link button. made web views clips. added delete on marquee.bob
2019-03-11cleaned up linkmenu.bob
2019-03-11cleaned up drag/drop interactions to be more consistent and complete.bob
2019-03-11fixed marquee modifiers.bob
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-11Delete .DS_Storetschicke-brown
2019-03-11Delete yarn.locktschicke-brown
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-09mergeMonika Hedman
2019-03-09about to mergeMonika Hedman
2019-03-09Updated packagesTyler Schicke
2019-03-09merge againMonika Hedman
2019-03-09merged with masterMonika Hedman
2019-03-09Merge pull request #46 from browngraphicslab/audiovideotschicke-brown
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 pull request #44 from browngraphicslab/improveTextStanley Yip
2019-03-08Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into im...yipstanley
2019-03-08asdfjklyipstanley