Commit Graph
28605 Commits
Author SHA1 Message Date
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
Brian Gough 0a3bd5fb07 upgrade to latest sqlite3 2017-01-24 16:06:32 +00:00
James Allen 59c40ea5cc Only show delete options when thread has more than one message! 2017-01-24 17:03:32 +01:00
Henry Oswald 13d21b881f use new annoncments feature for case study info 2017-01-24 16:03:05 +00:00
James Allen 798e09f011 Don't show 'no comments' when submitting 2017-01-24 16:56:08 +01:00
James Allen f9ba7392e9 Allow editing/deleting of comments and threads 2017-01-24 16:21:14 +01:00
Paulo Reis 1de8b3bce7 Disable text selection with right click on file tree. 2017-01-24 15:19:48 +00:00
James Allen 8725aeab03 Allow deleting of comment ranges 2017-01-24 15:57:11 +01:00
Henry Oswald 2341a8481a Merge branch 'master' into ho-promote-case-study 2017-01-24 14:49:35 +00:00
James Allen fa63eb6947 Allow editing/deleting of comments and threads 2017-01-24 15:44:32 +01:00
Brian Gough 0f92ef104a added docker script for acceptance tests 2017-01-24 12:18:30 +00:00
Brian Gough 08dc3bd744 fix acceptance tests 2017-01-24 11:07:54 +00:00
Shane Kilkelly 13c2fd794b Move web-sharelatex back to master branch. 2017-01-24 10:35:05 +00:00
Shane Kilkelly 9a3c1c7d22 Merge branch 'master' into ha-docker
# Conflicts:
#	app/coffee/Features/Email/EmailBuilder.coffee
2017-01-24 10:24:35 +00:00
Shane Kilkelly a148eb1f43 Merge branch 'master' into sk-rate-limit-cluster 2017-01-24 09:24:47 +00:00
Shane Kilkelly 0add3ed66e Merge branch 'master' into sk-upgrade-uuid 2017-01-23 10:04:31 +00:00
Shane Kilkelly abbffb8e4b Remove deprecated node-uuid package, replace with uuid. 2017-01-23 10:03:16 +00:00
James Allen dc976fd9e9 Use thread id for comment id 2017-01-23 09:45:46 +01:00
James Allen 2813b16ebf Use thread id for comment id 2017-01-23 09:45:37 +01:00
Henry Oswald 93bb7ee680 Merge pull request #396 from sharelatex/ho-rate-limit-email-send-2
Ho rate limit email send 2
2017-01-21 12:58:49 +00: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 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
James Allen fb39bb0442 Validate that ranges are present in a set document request 2017-01-19 12:15:14 +01: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 a997bf9c01 Lock down to older version of mongojs 2017-01-18 15:08:24 +01:00
James Allen 98f0bb5e19 Merge branch 'ja-track-changes' 2017-01-18 14:36:22 +01:00
James Allen 3cf58083d4 Add profiling end point 2017-01-18 14:34:28 +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