209 commits

Author	SHA1	Message	Date
James Allen	2581af0cda	Handle deleted files semi-gracefully	2014-03-21 14:48:26 +00:00
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
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
Henry Oswald	04bdde4d0d	added logging around publishing templates and changed another templates-api -> templates	2014-03-20 12:53:23 +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	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
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	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
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	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	efbb17a3b9	move all parameter handling to nodemailer.	2014-03-12 15:38:40 +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	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
Henry Oswald	260c5210a6	changed ga tracking created -> subscribed, fixed indentation on cancel sub events	2014-03-11 11:22: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	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	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
Henry Oswald	38d3bbb556	changed underscore templating to be standard syntax thoughout fixing main.tex name inserting bug, added tests to catch it in future	2014-03-06 12:28:07 +00:00
Henry Oswald	92928c35ab	removed old email tempaltes	2014-03-06 11:53:24 +00:00
Oliver Matthews	b73d7f23c3	don't log doc contents if file is unchanged.	2014-03-06 10:53:59 +00:00
Henry Oswald	5fc620dc10	move when template publish status is refreshed to avoid loop	2014-03-06 10:13:24 +00:00
Henry Oswald	f5e802a7d1	added null check for email property #ugly	2014-03-06 09:51:19 +00:00
Henry Oswald	9ae85abb74	got my email null check the wrong way around	2014-03-05 22:57:28 +00:00
Henry Oswald	e433eca157	added null checks into email sender for from address	2014-03-05 22:37:55 +00:00
James Allen	bf21305c68	Add in basic list of changes in track changes view	2014-03-05 17:55:47 +00:00
James Allen	8bf12f3286	Wrap editor in wrapper div and remove orchard CSS	2014-03-05 16:55:03 +00:00
James Allen	0468cbc300	Add in proxy to track changes api	2014-03-05 16:31:52 +00:00
Henry Oswald	32f9e33f71	removed heap analytics for the time being	2014-03-05 15:59:48 +00:00
Henry Oswald	64257a7b2c	testing out new google analytics	2014-03-05 15:45:24 +00:00
Henry Oswald	1842a65b83	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-05 15:05:43 +00:00
Henry Oswald	ffe690afa3	hooked up lifetime emails	2014-03-05 14:56:52 +00:00
Henry Oswald	a9327cb7c5	replyTo is overridable when sending email	2014-03-05 13:33:41 +00:00
Henry Oswald	274682a83d	deleted email manager	2014-03-05 12:07:09 +00:00
Henry Oswald	3431cf9070	share project email uses new email sender	2014-03-05 12:06:28 +00:00