Граф коммитов

21374 Коммитов

Автор SHA1 Сообщение Дата
Steven Lucco 3aebd04cc7 seq # and client id throughout 2017-03-03 16:27:43 -08:00
Steven Lucco 612be06051 mark range removed + tests 2017-03-02 16:44:49 -08:00
Steven Lucco 592127e07e change RB tree to class; add opTree w/ tests 2017-03-01 12:49:41 -08:00
Steven Lucco df42b273af diamond test 2017-02-23 16:13:05 -08:00
Steven Lucco 4cca842315 ignore js and map files 2017-02-23 13:23:23 -08:00
Steven Lucco 1252be0222 test code for ops 2017-02-22 14:38:51 -08:00
Kurt Berglund e80e62fe99 Remove lodash typings temporarily due to a conflict with typings in later version of TypeScript 2017-02-22 13:27:15 -08:00
Steven Lucco 3864f5b8d4 Merge branch 'master' of https://github.com/Microsoft/Prague 2017-02-22 10:41:25 -08:00
Steven Lucco becec27259 ops tests 2017-02-22 10:41:02 -08:00
Steven Lucco 0661ff8866 added ops 2017-02-22 10:40:38 -08:00
kurtb cafae4f54c Merge pull request #29 from kurtb/feature/pressure
Listen for enter/leave on the parent of the ink canvas.
2017-02-21 19:32:19 -08:00
kurtb cb6ef27e38 Listen for enter/leave on the parent of the ink canvas. Setting pointer events to none makes it so the canvas doesn't get these events. So we need to track them further up the parent chain 2017-02-21 19:30:23 -08:00
kurtb 33e4337e7d Merge pull request #28 from kurtb/feature/ink-on-objects
Feature/ink on objects
2017-02-20 17:48:53 -08:00
Kurt Berglund f35b80064f Add param to ink canvas to only handle ink events (vs mouse, touch) 2017-02-20 17:47:33 -08:00
Kurt Berglund 02f5f14ffe Allow for drawing on top of an ink layer 2017-02-20 17:17:25 -08:00
Steven Lucco 2080a1aa96 stress tests and bug fixes 2017-02-14 11:44:00 -08:00
Kurt Berglund edc7fe69f4 Allow for MUI objects to be dragged on canvas 2017-02-11 10:17:33 -08:00
kurtb 7fbf389212 Merge pull request #27 from kurtb/feature/canvas-object-update
Listen for canvas add updates and process them.
2017-02-10 18:33:32 -08:00
Kurt Berglund c572ca15fb Listen for canvas add updates and process them. 2017-02-10 18:32:02 -08:00
kurtb 973dace7ce Merge pull request #26 from kurtb/feature/gulp-less
Switch to building less files as part of build
2017-02-10 16:30:14 -08:00
Kurt Berglund df1812c34b Switch to building less files as part of build 2017-02-10 16:28:07 -08:00
kurtb 8020bd3677 Merge pull request #25 from kurtb/feature/text-canvas
Combine collab editor and canvas
2017-02-10 13:50:35 -08:00
Kurt Berglund 850889c566 Have canvas persist and load objects. 2017-02-10 13:48:59 -08:00
Kurt Berglund 16f4ef3597 Split collab types into model classes 2017-02-10 10:24:28 -08:00
Kurt Berglund 4f9ccd0427 Split off collab document so can be instantiated on own 2017-02-09 19:27:57 -08:00
Kurt Berglund e7dc47023a Move the quill collab editor to its own file 2017-02-08 18:59:39 -08:00
Steven Lucco 4e73b6fada Merge branch 'master' of https://github.com/Microsoft/Prague 2017-02-08 14:32:20 -08:00
Steven Lucco 830c2fee01 added flat checking and getText method 2017-02-08 14:31:49 -08:00
kurtb 114bf82bcd Merge pull request #24 from kurtb/feature/pressure
Factor stylus pressure with pen thickness when drawing strokes
2017-02-07 20:41:15 -08:00
kurtb 94fe2d7935 Factor stylus pressure with pen thickness when drawing strokes 2017-02-07 20:40:23 -08:00
kurtb 92338c6337 Merge pull request #23 from kurtb/feature/ot-ink-perf
Support compose OT operation
2017-02-07 16:51:00 -08:00
Kurt Berglund 2f6566d9f6 Combine OT operation 2017-02-07 16:47:12 -08:00
Kurt Berglund bfdb1e16af Multiple operations in an ink delta 2017-02-07 12:08:02 -08:00
kurtb e9ce31a0f8 Merge pull request #22 from kurtb/feature/ot-ink
Basic ink OT data structure
2017-02-06 12:07:00 -08:00
Kurt Berglund a4e4c19813 Remove unnecessary console logs 2017-02-06 12:05:30 -08:00
Kurt Berglund 1acbc6e0b7 Fix up snapshot format to be able to serialize correctly 2017-02-06 11:40:20 -08:00
Kurt Berglund be62b9ac18 Checkin OT tests 2017-02-05 21:18:39 -08:00
Kurt Berglund eeaeec913f Define OT operations. Create initial tests. 2017-02-04 10:25:25 -08:00
Kurt Berglund 599abb0535 Split off ink snapshot and types 2017-02-03 19:40:44 -08:00
Steven Lucco 9d8a4b70f3 small edits 2017-02-03 16:13:01 -08:00
kurtb 1bda29be5c Merge pull request #21 from kurtb/master
Install git in dockerfile given use of github based npm module
2017-02-01 16:25:52 -08:00
Kurt Berglund 9bf92d9a7e Install git in dockerfile given use of github based npm module 2017-02-01 15:30:43 -08:00
Steven Lucco fa6c11842e Merge branch 'master' of https://github.com/Microsoft/Prague 2017-02-01 10:49:26 -08:00
Steven Lucco 7e2593a490 added insert and retain 2017-02-01 10:48:46 -08:00
kurtb 0f232c00fc Merge pull request #20 from kurtb/master
Office Mix ink playback + record
2017-02-01 00:12:08 -08:00
Kurt Berglund 29f005742b Make mongo db configurable 2017-01-31 23:57:43 -08:00
Kurt Berglund b85b0cc4f3 Integrate mix rendering code 2017-01-31 18:36:17 -08:00
Kurt Berglund f19a852f56 Pull over mix rendering code 2017-01-31 16:36:56 -08:00
Kurt Berglund ca43bc65a8 Playback and recording of ink 2017-01-31 00:21:23 -08:00
Kurt Berglund 49e4e64bea Pull over Mix ink definition and storage 2017-01-30 19:20:13 -08:00