310 commits

Author	SHA1	Message	Date
James Allen	6c77ee4861	Highlight the changed files in the file list view	2014-03-27 12:45:11 +00:00
Henry Oswald	721eda71f3	show the publish template area to all project owners	2014-03-26 16:01:10 +00:00
Henry Oswald	fe16bea798	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-26 15:52:58 +00:00
James Allen	0255e08e1f	Don't show upgrade prompts for non-owners	2014-03-26 13:20:08 +00:00
James Allen	0e54c4ae49	Set up history with AB testing for different methods of upgrading	2014-03-25 16:44:30 +00:00
James Allen	fe99be48ac	Add upgrade message to history for free users	2014-03-25 16:44:30 +00:00
Henry Oswald	ba1371744b	deal with users who may have been deleted but are still inside a subscription group	2014-03-25 16:19:30 +00:00
Henry Oswald	116458671c	callback is not defined, use next when there is an error in controller	2014-03-25 14:39:51 +00:00
Henry Oswald	f13f036e55	add public into project public access level issue #35	2014-03-25 11:01:16 +00:00
Henry Oswald	ea9ba59371	updated google anltyics experiment code	2014-03-24 22:24:09 +00:00
Henry Oswald	2968fbcfff	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-24 15:24:01 +00:00
Henry Oswald	c68f2661a8	uri encode email and project names used in shared url	2014-03-24 15:23:50 +00:00
James Allen	66eb5e22f6	Always load font-awesome	2014-03-24 13:30:56 +00:00
James Allen	8a4dbf6618	Group changes by day for more concise display	2014-03-24 12:22:54 +00:00
James Allen	dc2dfaa66c	Flush project to track changes when leaving	2014-03-22 09:34:43 +00:00
Henry Oswald	8b706d6934	added some more event tracking in for google analytics	2014-03-21 18:33:53 +00:00
Henry Oswald	af659e7690	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-21 17:49:25 +00:00
Henry Oswald	4988fc4136	setup second plans page with free trial using google analytics experiements	2014-03-21 17:49:20 +00:00
James Allen	2a3e7ba9f3	Move restore button and logic into diff view	2014-03-21 14:31:04 +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	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	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	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	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	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
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	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
James Allen	417d76ab3f	Create (hopefully) more intuitive change selector	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	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	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	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	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
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	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	ffe690afa3	hooked up lifetime emails	2014-03-05 14:56:52 +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
Henry Oswald	8ba1a08245	hooked up password reset to use new email sending	2014-03-05 11:57:57 +00:00
Henry Oswald	3c18cc5553	email sending options are configurable from settings	2014-03-05 11:31:40 +00:00
Henry Oswald	5bacb2d784	added settings check on sending lifcycle emails out	2014-03-05 11:22:52 +00:00
Henry Oswald	eb92e5832b	renamed email templator -> email builder	2014-03-05 11:22:34 +00:00
Henry Oswald	360fac9510	setup basic new email feature which is tested, not linked up to real ... events yet	2014-03-04 18:10:06 +00:00
Henry Oswald	67e9d0724d	increased auto compile limits	2014-03-04 15:29:45 +00:00
Henry Oswald	149b51ddc6	put published date on template publishing area	2014-03-03 23:04:30 +00:00
Henry Oswald	413ef7440f	added a republish button to templates	2014-03-03 22:55:12 +00:00
Henry Oswald	a0805f97e0	added bulk removing of users to group admin panel	2014-03-03 17:48:48 +00:00
Henry Oswald	c991625a27	added uni message to plans page back in	2014-03-03 16:41:59 +00:00
Henry Oswald	99dc141693	deleteing user account cancels any subscription	2014-03-03 16:22:55 +00:00
Henry Oswald	dd22f1f7a1	added redis connection settings into rate limiter	2014-03-03 11:46:40 +00:00
Henry Oswald	ff8320bce0	added new rate limit file based on redback. converetd auto compile to ... use it.	2014-02-28 17:59:54 +00:00
Henry Oswald	aa0d26d5ab	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-02-27 17:35:48 +00:00
Henry Oswald	303a0e985b	improved the publish button process so it talks to the templates-api and lets the user know what is going on	2014-02-27 17:35:35 +00:00
Henry Oswald	cfe13af6ff	Merge pull request #45 from chid/crash-fix ... add proper error handlers to the UserController class	2014-02-26 11:21:23 +00:00
Henry Oswald	cad8e0eb1c	Update bonus.jade - remove extra comma	2014-02-26 08:52:57 +00:00
Charley Peng	fa80b0c3d2	fixing incorrectly written variable	2014-02-26 08:58:51 +11:00
James Allen	128c982ba2	Add open source banner to footer	2014-02-22 11:26:36 +00:00
James Allen	ca1ebd0413	Take default features from settings	2014-02-22 10:50:59 +00:00
Henry Oswald	029077fe6e	downloading a file now sets the filename in header correctly	2014-02-20 22:33:12 +00:00
Henry Oswald	a9c48d666d	fixed broken delete effect due to project id quotes being rendered twice for some unknow reason	2014-02-20 21:26:26 +00:00
James Allen	d249158676	Don't try to fingerprint plans.css	2014-02-18 17:37:39 +00:00
Henry Oswald	347671c89b	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-02-14 18:13:33 +00:00
Henry Oswald	65f849aad0	fixed bug where file uploader was calling cb on read stream not write stream, race condition created.	2014-02-14 18:13:22 +00:00
James Allen	fd911c278f	Move copyright images into brand directory	2014-02-14 11:44:09 +00:00
James Allen	4ec7deb7d6	Move plans.css to brand folder	2014-02-14 11:36:06 +00:00
James Allen	5ea231dea6	Sort iconshock icons into directory and add credit	2014-02-13 18:18:05 +00:00
James Allen	6eff979e2a	Move nide images into one folder	2014-02-13 15:35:44 +00:00
James Allen	7fb0dadbfd	Remove unneeded image files	2014-02-13 14:47:29 +00:00
Henry Oswald	b46f320882	linked to my twitter on about page	2014-02-13 14:32:07 +00:00
Henry Oswald	3c98dfec90	add Monendra to security acknowledgements list	2014-02-13 14:31:23 +00:00
James Allen	768fd20850	Allow NewletterManager to be called without a callback	2014-02-13 12:37:23 +00:00
James Allen	8715690ce9	Intial open source comment	2014-02-12 10:23:40 +00:00
Charley Peng	3f6e240401	adding callback on error	2007-03-01 16:53:59 +11:00