aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2019-02-26Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into ↵laurawilsonri
improveText
2019-02-26mer conmadelinegr
2019-02-26mergemadelinegr
2019-02-26nav updatesMonika Hedman
2019-02-26extended CollectionTreeView to support drag and drop. updated ↵bob
CollectionSchemaView's drag drop
2019-02-26scrollbar reduxbob
2019-02-26finished stickies/area-selection and made them saveable, single line ↵Andrew Kim
highlighting and annotation, ink for drawing on stickies and on the PDF canvas itself
2019-02-25for macBob Zeleznik
2019-02-25fixed some small thingsBob Zeleznik
2019-02-25ALL SETgit add -Alaurawilsonri
2019-02-25stable, commented out client side sessions with cookie-sessionSam Wilkins
2019-02-25scale still not workingMonika Hedman
2019-02-25Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into ↵laurawilsonri
improveText
2019-02-25pin and remove docmadelinegr
2019-02-25refactored out bullets and can retitle main collection, but still need to ↵madelinegr
retitle nested collections
2019-02-25all but removing preview cursor workslaurawilsonri
2019-02-25Search fixedEleanor Eng
2019-02-25added in editableview stuff and minor css stylingmadelinegr
2019-02-25merging 2Monika Hedman
2019-02-25mergingMonika Hedman
2019-02-25Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into ↵Eleanor Eng
contextMenu
2019-02-25pres view changes and add context menu buttonmadelinegr
2019-02-25client side session management an option, still interfered with by server ↵Sam Wilkins
restart
2019-02-25Got rid of ids and dom manipulationTyler Schicke
2019-02-25redid presentation view classmadelinegr
2019-02-25No wrappingEleanor Eng
2019-02-25Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into ↵madelinegr
presentation_view mer
2019-02-25Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into ↵Tyler Schicke
treeview
2019-02-25made pres viewmadelinegr
2019-02-25Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-WebTyler Schicke
2019-02-25Fixed docking thingTyler Schicke
2019-02-25fixed some of bugs caused by pulling from mastermadelinegr
2019-02-25tweaksbob
2019-02-25mer conmadelinegr
2019-02-25drag and drop of main buttons.bob
2019-02-25added drag/drop out of schema viewbob
2019-02-25fixed so that docs are centered in middle of window.bob
2019-02-25Merge branch 'master' of https://github.com/browngraphicslab/Dash-Webbob
2019-02-25fixes for dropping documents without a know height.bob
2019-02-25Another debug view fixTyler Schicke
2019-02-25Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-WebTyler Schicke
2019-02-25now sends email on successfull passwordSam Wilkins
2019-02-25minor fixesSam Wilkins
2019-02-25after pop, hard resetSam Wilkins
2019-02-25Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into ↵Tyler Schicke
authentication
2019-02-25more css cleanupBob Zeleznik
2019-02-25Merge branch 'authentication' of ↵Sam Wilkins
https://github.com/browngraphicslab/Dash-Web into authentication
2019-02-25stopped being an idiotSam Wilkins
2019-02-25Merge branch 'authentication' of github-tsch-brown:browngraphicslab/Dash-Web ↵Tyler Schicke
into authentication
2019-02-25Merge branch 'authentication' of ↵Sam Wilkins
https://github.com/browngraphicslab/Dash-Web into authentication