17911 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James Allen	5f8ed42006	Show blank diff for files that haven't changed	2014-03-21 14:31:04 +00:00
James Allen	2a3e7ba9f3	Move restore button and logic into diff view	2014-03-21 14:31:04 +00:00
James Allen	2cd85fefec	Flush all docs in a project before getting updates	2014-03-21 13:48:14 +00:00
James Allen	cd9cb51027	Delete doc_id from DocsWithHistoryOps set when processing	2014-03-21 13:17:58 +00:00
James Allen	375427bf5e	Remove extraneous logging	2014-03-21 13:15:42 +00:00
James Allen	c0be3ef37b	Put doc_ids with history changes into project level set	2014-03-21 12:41:05 +00:00
Henry Oswald	63a5f2bf44	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-21 12:20:58 +00:00
Henry Oswald	2cca6c3775	changed event tracking to work correctly, only certain json attrs are allowed	2014-03-21 12:20:33 +00:00
Henry Oswald	3e3b1d3f5b	remove codemirror.css	2014-03-21 11:36:14 +00:00
James Allen	70da673bed	Move track changes activation into old history place	2014-03-20 16:45:39 +00:00
James Allen	237f738650	Allow changing between files while in diff view mode	2014-03-20 16:30:52 +00:00
James Allen	b99eaecf82	Load history view using mainAreaManager	2014-03-20 16:30:52 +00:00
James Allen	9fa80ad757	Load diff for selected doc	2014-03-20 16:30:52 +00:00
James Allen	c0686b6592	Load entire project history into change list view	2014-03-20 16:30:52 +00:00
James Allen	6aaa7ba8d5	Group toV and fromV by the doc they correspond to	2014-03-20 13:37:23 +00:00
Henry Oswald	04bdde4d0d	added logging around publishing templates and changed another templates-api -> templates	2014-03-20 12:53:23 +00:00
James Allen	5595910122	Return a summary of the entire project changes	2014-03-20 12:10:04 +00:00
Henry Oswald	69904e2acd	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-20 08:52:17 +00:00
Henry Oswald	7310f94511	fire ga events on renames/deletes	2014-03-20 08:52:04 +00:00
Henry Oswald	4f577b5467	add events around upgrade process	2014-03-20 08:18:15 +00:00
James Allen	5a42d30716	Merge pull request #73 from cwoac/nodemailer ... config changes for nodemailer	2014-03-19 22:31:18 +00:00
James Allen	b7de4c9c6c	Implement project update getter methods	2014-03-19 17:44:16 +00:00
James Allen	962fc18329	Store project_id alongside each change	2014-03-19 16:40:55 +00:00
James Allen	fec648666c	Add in project_id to flushing HTTP endpoint	2014-03-19 16:14:17 +00:00
James Allen	2d28f1903f	Flush to the track changes api using the project id as well	2014-03-19 15:56:44 +00:00
James Allen	7d50c9c7aa	Use different color schemes for dark or light editor schemes	2014-03-19 11:23:27 +00:00
James Allen	d5f130ad07	Improve more change messages and make them clickable	2014-03-19 10:53:05 +00:00
James Allen	1398d85626	Improve date format in change list	2014-03-19 10:53:05 +00:00
James Allen	a8ca388146	Allow shift-click to select multiple versions	2014-03-19 10:53:05 +00:00
James Allen	d32b0ee12f	Fetch updates up to the limit, even after summarising	2014-03-18 18:09:25 +00:00
Henry Oswald	3c9f6e0ce0	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-18 15:09:50 +00:00
Henry Oswald	87167841d0	set holding account to false when registered	2014-03-18 15:09:44 +00:00
Henry Oswald	069efaba1b	dont show publish area if it is an open user	2014-03-18 15:08:09 +00:00
Henry Oswald	8cb21ee2f9	adds compile function to grunt file for tpds worker and background jobs worker	2014-03-18 15:07:16 +00:00
Henry Oswald	fc2b42400f	Merge pull request #54 from cwoac/nodemailer-passthrough ... Nodemailer passthrough	2014-03-18 13:09:14 +00:00
James Allen	81811d7cc5	Move update summarizing logic into UpdatesManager	2014-03-18 11:41:48 +00:00
James Allen	22a806a200	Fix issues with consuming delete updates beyond the end of the diff	2014-03-17 14:54:02 +00:00
James Allen	ea0b0c2ec2	Fine tune logging	2014-03-17 12:50:30 +00:00
James Allen	9010557a75	Update snippets	2014-03-17 12:50:24 +00:00
James Allen	14bf20e087	Fix broken sharing page when not the owner of a project	2014-03-15 11:56:18 +00:00
James Allen	a99783edc7	Log more information in the client side errors	2014-03-14 17:23:50 +00:00
James Allen	5efd19ffc4	Update the styling and workflow around publishing a template	2014-03-14 14:42:38 +00:00
James Allen	7b2eef22a9	remove console.log debugging line	2014-03-14 12:25:25 +00:00
James Allen	498e0d4787	Fix unit tests	2014-03-14 11:56:15 +00:00
James Allen	4c76b88a2d	Log out incoming and outgoing real-time updates	2014-03-14 11:51:19 +00:00
James Allen	745d112d2b	Report client side ShareJs error back to server and log them out	2014-03-14 11:14:33 +00:00
James Allen	6701de796e	Resize diff view on editor view port change	2014-03-14 10:20:00 +00:00
Henry Oswald	191170509f	bumped convert timeout to 40 seconds	2014-03-14 08:55:28 +00:00
James Allen	b3096fc74e	Show helpers to make navigating around diffs easier	2014-03-13 17:32:39 +00:00
Henry Oswald	9a86f24bf7	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-13 17:10:15 +00:00