aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2019-03-17Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into ↵Tyler Schicke
schema_columns
2019-03-17Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into ↵Tyler Schicke
DocContents
2019-03-17nacho friesyipstanley
2019-03-17Merge branch 'authentication' of ↵Sam Wilkins
https://github.com/browngraphicslab/Dash-Web into authentication
2019-03-17added tuple field, beginnig remote cursor displaySam Wilkins
2019-03-17Changed session secret to work betterTyler Schicke
2019-03-17Small image context menu itemTyler Schicke
2019-03-17ahyipstanley
2019-03-17uhyipstanley
2019-03-17changesyipstanley
2019-03-17client side interactionsyipstanley
2019-03-17Updated ImageUploadAndrew Kim
2019-03-17small fixesyipstanley
2019-03-17updatesyipstanley
2019-03-17Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into ↵yipstanley
view_doc_impl
2019-03-17commitment is difficultyipstanley
2019-03-17merged with master, resolved conflicts and reformatted workspace menuSam Wilkins
2019-03-17one line change inserted inking control in main, had gotten lost in mergeSam Wilkins
2019-03-17think I fixed popoutsBob Zeleznik
2019-03-17back to the original versionBob Zeleznik
2019-03-17fixed some thingsAndrew Kim
2019-03-17testing mobile imageAndrew Kim
2019-03-17fixed url popout.Bob Zeleznik
2019-03-17adjusted caption layoutBob Zeleznik
2019-03-17Merge branch 'master' of https://github.com/browngraphicslab/Dash-WebBob Zeleznik
2019-03-17added popout to new window for docking frameBob Zeleznik
2019-03-16Testing Mobile ImageAndrew Kim
2019-03-16Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into kvp_uiTyler Schicke
2019-03-16Merge pull request #43 from browngraphicslab/kvptschicke-brown
Kvp
2019-03-16Fixes and cleanupTyler Schicke
2019-03-16Merge branch 'master' of https://github.com/browngraphicslab/Dash-WebBob Zeleznik
2019-03-16made opening new window for a doc set the document origin to be at the ↵Bob Zeleznik
window center.
2019-03-16Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into kvpTyler Schicke
2019-03-16Merge pull request #59 from browngraphicslab/improveTexttschicke-brown
Comments on text toolbar stuff
2019-03-16Fixed server bugTyler Schicke
2019-03-16Merge pull request #60 from browngraphicslab/templatetschicke-brown
Template
2019-03-16CleanupTyler Schicke
2019-03-16Everything but the actual template worksTyler Schicke
2019-03-16Added context menu option to copy document idTyler Schicke
Added route to handle going to any doc id
2019-03-16initial steps toward implementing remote cursor displaySam Wilkins
2019-03-16yellow pageAndrew Kim
2019-03-16cant get image stuff????Monika Hedman
2019-03-16testAndrew Kim
2019-03-16test3Andrew Kim
2019-03-16test2Andrew Kim
2019-03-16merge conflicts resolvedAndrew Kim
2019-03-16asdfasfdAndrew Kim
2019-03-16Merge branch 'contextMenu' of https://github.com/browngraphicslab/Dash-Web ↵Eleanor Eng
into contextMenu
2019-03-16commit to pullEleanor Eng
2019-03-16Merge branch 'server_dev' of github-tsch-brown:browngraphicslab/Dash-Web ↵Tyler Schicke
into server_dev