11 commits

Author	SHA1	Message	Date
Scott Erickson	eed521fb8c	Merged conflicts.	2014-07-04 17:54:30 -07:00
Scott Erickson	ca8394621d	Fixes #1223	2014-07-04 11:46:33 -07:00
Ruben Vereecken	6e4170012f	Made sure applyDelta is called in all cases	2014-07-04 18:38:15 +02:00
Scott Erickson	254c6ff7ba	Fixed #1106 a bunch. Patches show up correctly, don't include skipped paths when patching, and skipped paths are now used in the patch modal too.	2014-05-30 13:40:38 -07:00
Scott Erickson	9c3cefa457	Removed a couple logs I forgot about.	2014-05-08 14:28:18 -07:00
Scott Erickson	e9fc3df7c1	Set up the versions modal to display changes between versions when you select two of them.	2014-05-08 10:54:39 -07:00
Scott Erickson	7ccaa8c843	Fixed a bug, colored a badge.	2014-04-17 14:39:52 -07:00
Scott Erickson	34bf484bf2	Added data merge conflict handling.	2014-04-11 21:11:52 -07:00
Scott Erickson	5629284c76	Added text diff library to delta view.	2014-04-10 10:24:14 -07:00
Scott Erickson	66d455285e	Integrated the delta view into the save view for levels.	2014-04-09 19:07:44 -07:00
Scott Erickson	f2d21b960f	Added a delta subview for displaying deltas of schema'd data.	2014-04-09 16:09:35 -07:00