23800 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Henry Oswald	f2069c6208	converted all analytics to use new google analytics, removing mixpanel ... and heap. Not tracking subscriptions or cancelations yet.	2014-03-08 19:00:26 +00:00
Henry Oswald	39cecfa5d8	fixed our -> out in about page	2014-03-08 18:09:02 +00:00
James Allen	adc42f7cf6	Remove logging line	2014-03-07 14:48:38 +00:00
James Allen	9c20d1d604	Fix momentjs in project list view	2014-03-07 14:41:01 +00:00
Oliver Matthews	8989284e10	move from node-ses to nodemailer	2014-03-07 14:08:21 +00:00
James Allen	866084ee6b	Pop last version, not last timestamp	2014-03-07 14:02:16 +00:00
James Allen	a0b02d85f5	Load changes in batches of 25	2014-03-07 13:31:30 +00:00
James Allen	9851321429	Merge branch 'track_changes_integration'	2014-03-07 13:17:30 +00:00
James Allen	548d7d98a4	Allow history view to be closed	2014-03-07 13:05:59 +00:00
James Allen	e0cd9ba163	Improve the description above each change	2014-03-07 12:54:08 +00:00
James Allen	ebe4e5b1d8	Show consistent colors for different users	2014-03-07 12:00:31 +00:00
James Allen	36faedeeb3	Make the history entries pretty	2014-03-07 11:24:11 +00:00
James Allen	be8035faa8	Include names in view	2014-03-06 18:13:07 +00:00
James Allen	b45db3aa2b	Return user details like email and name in updates	2014-03-06 18:04:00 +00:00
James Allen	9329213d94	Allow multiple diffs to be selected	2014-03-06 16:32:18 +00:00
James Allen	1a91036bb6	Show nice diffs using ace and markers	2014-03-06 14:08:12 +00:00
Henry Oswald	7efa51fb62	Merge pull request #51 from cwoac/reduce_doclines_logging ... don't log doc contents if file is unchanged.	2014-03-06 12:50:52 +00:00