aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/MainView.tsx
AgeCommit message (Expand)Author
2024-10-10Merge branch 'master' into alyssa-starterbobzel
2024-10-10Merge branch 'master' into nathan-starterbobzel
2024-10-07Merge branch 'master' into alyssa-starterbobzel
2024-10-07fixed import cycle by making addHotKey a propbobzel
2024-10-04cleaning up lint problems.bobzel
2024-10-01Merge branch 'master' into nathan-starterbobzel
2024-10-01Merge branch 'master' into alyssa-starterbobzel
2024-10-01Merge branch 'eleanor-gptdraw' of https://github.com/brown-dash/Dash-Web into...eleanor-park
2024-10-01working on image bug for a whileeleanor-park
2024-10-01more lint fixesbobzel
2024-10-01Merge branch 'master' into eleanor-gptdrawbobzel
2024-10-01fixed eraser mode button to show current eraser and to show options.bobzel
2024-10-01Merge branch 'master' of https://github.com/brown-dash/Dash-Web into nathan-s...Nathan-SR
2024-09-19Merge branch 'master' into zach-starterbobzel
2024-09-19merged with masterbobzel
2024-09-19merged with master -- updated filtering from cardView branchbobzel
2024-09-17cleaning up card view stuff post-mergebobzel
2024-09-17Merge branch 'master' into aisosa-starteraidahosa1
2024-09-17Merge branch 'master' into aisosa-starteraidahosa1
2024-09-11merged with masterbobzel
2024-09-11Merge branch 'master' into zach-starterbobzel
2024-09-11Merge branch 'master' into alyssa-starterbobzel
2024-09-10moved TagsView up into DocumentView so that one row of tags will be visible. ...bobzel
2024-09-07expanded preview optionNathan-SR
2024-09-02Merge branch 'master' into alyssa-starterbobzel
2024-08-31Merge branch 'master' into zach-starterZachary Zhang
2024-08-29from lastbobzel
2024-08-29from last cleanupbobzel
2024-08-28template matching algorithmNathan-SR
2024-08-27Merge branch 'master' into eleanor-gptdraweleanor-park
2024-08-25border workNathan-SR
2024-08-21cleanup of face recognition. some lint fixes.bobzel
2024-08-12more any -> type fixesbobzel
2024-08-11generated templates appear in menuNathan-SR
2024-08-08many changes to add typing in place of 'any's etcbobzel
2024-08-06locking into hotkey buttonsaidahosa1
2024-07-30Merge branch 'master' of https://github.com/brown-dash/Dash-Web into nathan-s...Nathan-SR
2024-07-26Revert "Merge branch 'master' into eleanor-gptdraw"eleanor-park
2024-07-26Merge branch 'master' into eleanor-gptdraweleanor-park
2024-07-25Merge branch 'master' into alyssa-starteralyssaf16
2024-07-24bug and render fixeseleanor-park
2024-07-23Merge remote-tracking branch 'origin/zach-starter' into eleanor-gptdraweleanor-park
2024-07-23merging w/ zach's brancheleanor-park
2024-07-18gesture improvementsZachary Zhang
2024-07-18boutta get sillyaidahosa1
2024-07-17UI overhaul for topbarNathan-SR
2024-07-16work on menu (mostly UI improvements)Nathan-SR
2024-07-14Merge branch 'master' into aisosa-starteraidahosa1
2024-07-14in it to win itaidahosa1
2024-07-11Merge branch 'eleanor-gptdraw' of https://github.com/brown-dash/Dash-Web into...eleanor-park