Commit graph

7076 commits

Author SHA1 Message Date
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
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00:00
Paulo Reis
73c1016f4a Avoid using 0px, because minifiers might convert the value to 0, which will still cause issues on IE. 2017-01-19 16:58:16 +00:00
Paulo Reis
1970ab4e63 Ensure that the change text fits the entry UI in IE. 2017-01-19 16:55:21 +00:00
Paulo Reis
a4ca7e2ca9 Fix padding in the review panel toolbar for IE. 2017-01-19 16:54:34 +00:00
Paulo Reis
cd975c6190 Make resolved comments dropdown scrollable in IE. 2017-01-19 15:43:26 +00:00
Paulo Reis
76ea469970 Reposition the track-changes indicator element to avoid issues with IE positioning. 2017-01-19 12:12:34 +00:00
Paulo Reis
3b9a599276 Fix entries z-index issues on IE10. 2017-01-19 11:57:49 +00:00
Paulo Reis
5489514d7a Add some compatibility style rules for IE10. 2017-01-18 15:38:34 +00:00
Paulo Reis
e0f3593bff Add autoprefixer to Grunt tasks. 2017-01-18 15:38:18 +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
James Allen
f12aeedb35 Tweak padding around track changes toggle loading indicator 2017-01-16 16:57:20 +01:00
James Allen
5fb54d8447 Don't refresh resolved comments every times an entry changes 2017-01-16 16:55:14 +01:00
James Allen
bf56952f88 Make overview panel entries jump to place in doc again 2017-01-16 15:31:51 +01:00
James Allen
d4f60977fd Add loading indicator while submitting new comments 2017-01-16 15:25:10 +01:00
James Allen
e5c96eb619 Focus on text area when adding a comment 2017-01-16 15:17:56 +01:00
James Allen
278bfc1f50 Use 'show all' instead of 'more' 2017-01-16 15:06:47 +01:00
Shane Kilkelly
82ddeab2bd If user tries to invite themselves to project, don't. 2017-01-16 13:45:01 +00:00
Shane Kilkelly
635b935acc Add an acceptance test for login rate limits, cleanup 2017-01-16 11:46:59 +00:00