3872 commits

Author	SHA1	Message	Date
Shane Kilkelly	60500bc4ea	update shrinkwrap	2017-01-25 10:52:08 +00:00
Shane Kilkelly	f7b4e00466	Restore npm-shrinkwrap.json	2017-01-25 10:30:53 +00:00
Shane Kilkelly	239164fe26	Merge branch 'master' into sk-rate-limit-cluster	2017-01-25 09:56:08 +00:00
Henry Oswald	cc717f0357	domainAnnouncementsToShow -> domainAnnouncements	2017-01-25 09:44:13 +00:00
Henry Oswald	02e6eb4dd1	Merge pull request #399 from sharelatex/ho-promote-case-study ... promote domain alerts	2017-01-25 09:41:50 +00:00
Henry Oswald	1280a2313d	add check for id to exist in domain announcments ... null check user at start of getUnreadAnnouncements fix spelling mistake	2017-01-25 09:35:11 +00:00
Henry Oswald	69ab275404	Update list.jade	2017-01-25 09:14:21 +00:00
Henry Oswald	13d21b881f	use new annoncments feature for case study info	2017-01-24 16:03:05 +00:00
Paulo Reis	1de8b3bce7	Disable text selection with right click on file tree.	2017-01-24 15:19:48 +00:00
Henry Oswald	2341a8481a	Merge branch 'master' into ho-promote-case-study	2017-01-24 14:49:35 +00:00
Shane Kilkelly	a148eb1f43	Merge branch 'master' into sk-rate-limit-cluster	2017-01-24 09:24:47 +00:00
James Allen	2813b16ebf	Use thread id for comment id	2017-01-23 09:45:37 +01:00
Henry Oswald	9153ffac41	limit project name in email to 40 chars	2017-01-21 12:58:16 +00:00
Henry Oswald	74240e28c7	rate limit via ip the number of invite to project requests	2017-01-21 12:44:09 +00:00
Henry Oswald	6d35585847	limit number of invites each user can do ... done with the number of collaborators a user can add prevents notifications getting filled up as well	2017-01-21 12:43:15 +00:00
Henry Oswald	6f2c7ba6c6	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2017-01-20 14:51:23 +00:00
Henry Oswald	03555f0339	added chris and removed geri from pics	2017-01-20 14:50:38 +00:00
Shane Kilkelly	cfa2777d62	Merge branch 'sk-launchpad'	2017-01-20 13:58:16 +00:00
Shane Kilkelly	36eb453aed	Clarify logic of asyncform onsuccess and onerror handlers	2017-01-20 13:52:31 +00:00
Shane Kilkelly	8922c9dbf5	New email layout for "testEmail"	2017-01-18 15:28:51 +00:00
James Allen	3413687833	Merge pull request #393 from sharelatex/ja-track-changes ... Ja track changes	2017-01-18 15:32:16 +01:00
James Allen	f97d36eb73	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-18 14:07:29 +01:00
Paulo Reis	2589ac7d58	Remove unneeded review panel layout event.	2017-01-18 10:55:51 +00:00
Paulo Reis	49fe8ef3a3	Update entry truncating logic while typing.	2017-01-18 10:53:59 +00:00
Paulo Reis	329c6af168	Add a track-changes indicator in the editor, for when the review panel is closed.	2017-01-17 17:20:51 +00:00
James Allen	a8618fa4d9	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-17 17:36:30 +01:00
James Allen	786c92b2fc	Don't show delete comment button (until it works)	2017-01-17 17:34:11 +01:00
Shane Kilkelly	707838baa4	Merge branch 'master' into sk-launchpad	2017-01-17 16:25:59 +00:00
Shane Kilkelly	59ab66fca2	Fix double-callback	2017-01-17 16:25:18 +00:00
Paulo Reis	f27118084c	Make review header icon behave like font-awesome icons.	2017-01-17 16:03:41 +00:00
James Allen	318313d66c	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-17 16:55:25 +01:00
James Allen	4d15fc30ba	Don't flash resolved comments when editor is loading	2017-01-17 16:55:18 +01:00
James Allen	5a34d17947	Toggle track changes in a project based on the owner's feature switch	2017-01-17 15:59:18 +01:00
Shane Kilkelly	d7251c6bfe	Merge branch 'master' into sk-launchpad	2017-01-17 14:55:08 +00:00
Paulo Reis	2f119e5787	Track review features usage.	2017-01-17 14:39:31 +00:00
Shane Kilkelly	1137ab0715	Don't record redirect to static asset paths	2017-01-17 14:35:37 +00:00
James Allen	e15d01874d	Remove comment from dropdown when it is reopened	2017-01-17 15:13:50 +01:00
James Allen	dec9b5bf1e	Use email if name is blank	2017-01-17 15:10:44 +01:00
James Allen	960d1e8b2f	Only call /project/.../threads if we need the threads	2017-01-17 15:04:49 +01:00
James Allen	4a47d135c7	Reapply ops to track changes as current user when reconnecting	2017-01-17 14:54:22 +01:00
Shane Kilkelly	70c7e32e58	Add a 'testEmail' email type	2017-01-17 10:52:04 +00:00
James Allen	eb8e801dea	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-17 11:51:11 +01:00
James Allen	1b63db91d0	Add in a null check	2017-01-17 11:51:02 +01:00
Paulo Reis	d66f2033bb	Ensure that review panel elements are above, z-index-wise, Ace elements.	2017-01-17 10:16:10 +00:00
Shane Kilkelly	06bba062a4	Merge branch 'master' into sk-launchpad	2017-01-17 09:29:37 +00:00
James Allen	9c0bf885be	Merge branch 'master' into ja-track-changes	2017-01-17 10:16:41 +01:00
Paulo Reis	36f15ff56e	Avoid empty comment submission.	2017-01-16 17:14:06 +00:00
Paulo Reis	121629426e	Avoid empty comment replies.	2017-01-16 17:06:57 +00:00
Paulo Reis	1c8942c5c6	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-16 16:28:27 +00:00
Paulo Reis	65e257ca37	Change text marker colors on Ace dark themes.	2017-01-16 16:25:38 +00:00