17867 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Henry Oswald	b4c5f6f253	don't show the template area for non owners	2014-03-13 17:10:06 +00:00
James Allen	df706da7e0	Add history entry into context menu for docs	2014-03-13 14:32:30 +00:00
James Allen	540aaf0672	Add in some null checks	2014-03-13 14:30:01 +00:00
Henry Oswald	41b32deac3	changed conversions to work with new image magick feature pdf:fit-page=	2014-03-13 14:04:46 +00:00
James Allen	81fcafb476	Make track changes a feature flag	2014-03-13 13:58:57 +00:00
James Allen	7aab6c4c0b	Add in dropdown and context menu for files	2014-03-13 13:01:04 +00:00
Henry Oswald	4864eeba0a	check if files exist before fingerprinting them issue #75 on sharelatex	2014-03-13 12:38:16 +00:00
Henry Oswald	c237d04456	fingerprint brand/plans.css	2014-03-13 10:06:33 +00:00
Henry Oswald	f7545393f2	fix bad logging on email sender	2014-03-12 23:37:54 +00:00
Henry Oswald	fa6065b298	changed logging which was causing error, reading _id on null	2014-03-12 23:37:10 +00:00
Henry Oswald	b7104a82e9	added null check when filtering elements	2014-03-12 22:44:15 +00:00
Henry Oswald	e7f8d11e45	added checks on error and response status code for smoke tests to make them easier to follow in logs	2014-03-12 22:29:44 +00:00
Henry Oswald	d20286febd	stop response sending twice if compile takes a long time when testing	2014-03-12 21:56:58 +00:00
Henry Oswald	52cb1a4dcd	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-12 21:33:27 +00:00
Henry Oswald	77aadf1845	plans.css trying to fingerprint wrong file	2014-03-12 21:33:15 +00:00
James Allen	451ff14e65	Improve track changes css	2014-03-12 17:13:38 +00:00
James Allen	05443b85da	Automatically show a sensible diff to start	2014-03-12 17:09:11 +00:00
James Allen	e0da6da4c6	Improve hover info in diff	2014-03-12 16:46:20 +00:00
Oliver Matthews	34c7a35845	config changes for nodemailer	2014-03-12 15:43:00 +00:00
Oliver Matthews	efbb17a3b9	move all parameter handling to nodemailer.	2014-03-12 15:38:40 +00:00
James Allen	9977a418c3	Compare diffs with user.id, not user_id	2014-03-12 14:04:33 +00:00
James Allen	575afae048	Compress adjacent inserts and deletes into one diff item	2014-03-12 13:27:18 +00:00
James Allen	be64b510e8	Support the new update format from the track changes api	2014-03-11 18:01:14 +00:00
James Allen	7fa88f6b41	Summarise updates when returning them	2014-03-11 17:40:07 +00:00
James Allen	4ecb17b16e	Put multiple ops in one update	2014-03-11 15:24:38 +00:00
James Allen	064bdc3eea	Take user id in from request header and pass to doc updater	2014-03-11 13:01:07 +00:00
James Allen	4f878e000b	Allow source and user_id to be included when setting a document	2014-03-11 12:47:26 +00:00
James Allen	da9fa28612	Remove mention of Dropbox in external update dialog	2014-03-11 12:16:51 +00:00
James Allen	1a9c86417c	Add question mark to restore modal	2014-03-11 12:14:52 +00:00
James Allen	afb8bb6a42	Add in restore button to track changes	2014-03-11 12:14:52 +00:00
Henry Oswald	e364fd9c5f	moved id for cancel selector to correct button	2014-03-11 11:47:24 +00:00
James Allen	3d1d962501	Don't try to fetch user when id doesn't exist	2014-03-11 11:45:25 +00:00
Henry Oswald	260c5210a6	changed ga tracking created -> subscribed, fixed indentation on cancel sub events	2014-03-11 11:22:03 +00:00
James Allen	83b2aa3082	add in restore end point	2014-03-10 16:58:39 +00:00
James Allen	7eb8699b93	Refactor diff manager	2014-03-10 16:03:03 +00:00
Henry Oswald	92c68177a6	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-10 15:08:04 +00:00
Henry Oswald	70fcac19a6	added message of failed login/register into google analytics	2014-03-10 15:07:54 +00:00
James Allen	417d76ab3f	Create (hopefully) more intuitive change selector	2014-03-10 14:59:01 +00:00
James Allen	ceca16e507	Remove double quote from end of array snippet	2014-03-10 14:59:01 +00:00
Henry Oswald	21ec74e51c	hooked up the recurly config to recurly.js correctly	2014-03-09 10:23:37 +00:00
Henry Oswald	eeee980bd2	removed ab testing from main.coffee	2014-03-09 10:14:58 +00:00
Henry Oswald	3d0bd34b50	added event tracking to subscription cretion/cancelation	2014-03-09 09:56:58 +00:00
Henry Oswald	e7602321e9	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-08 19:01:21 +00:00
Henry Oswald	0e7d241fcf	fixed has subscription check causing bad redirects ... subscription != recurlySubscription	2014-03-08 19:01:00 +00:00