Shane Kilkelly
|
4e9426e6bf
|
Merge branch 'master' into sk-pug
|
2017-01-30 14:36:10 +00:00 |
|
Shane Kilkelly
|
3ed85dad42
|
Merge branch 'master' into sk-upgrade-uuid
|
2017-01-30 11:09:50 +00:00 |
|
James Allen
|
abb4ef14d8
|
Streamline the update/rendering process to not do extra work
|
2017-01-26 15:08:30 +01:00 |
|
James Allen
|
32b0c6a4fb
|
Merge pull request #398 from sharelatex/ja-track-changes
Fix style issues in IE 10
|
2017-01-25 15:55:15 +01:00 |
|
James Allen
|
757c7002eb
|
Merge pull request #397 from sharelatex/ja-modify-threads
Allow editing/deleting of comments and threads
|
2017-01-25 15:50:00 +01:00 |
|
Paulo Reis
|
a924794a5a
|
Add expandable text area directive; apply it to review panel text areas.
|
2017-01-25 13:51:33 +00:00 |
|
Shane Kilkelly
|
e2f4fc3653
|
Merge branch 'master' into sk-rate-limit-cluster
|
2017-01-25 10:52:34 +00:00 |
|
Henry Oswald
|
3eb13ccdd1
|
fix stupid mistake
|
2017-01-25 10:38:39 +00:00 |
|
Henry Oswald
|
2a00b9c7a2
|
use user._id for error log
|
2017-01-25 10:33:30 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Shane Kilkelly
|
cfa2777d62
|
Merge branch 'sk-launchpad'
|
2017-01-20 13:58:16 +00:00 |
|
Shane Kilkelly
|
57cd54bf55
|
WIP: migrate from jade to pug
|
2017-01-20 12:03:02 +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
|
5489514d7a
|
Add some compatibility style rules for IE10.
|
2017-01-18 15:38:34 +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
|
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
|
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 |
|
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 |
|
Shane Kilkelly
|
1137ab0715
|
Don't record redirect to static asset paths
|
2017-01-17 14:35:37 +00:00 |
|
James Allen
|
960d1e8b2f
|
Only call /project/.../threads if we need the threads
|
2017-01-17 15:04:49 +01:00 |
|
Shane Kilkelly
|
70c7e32e58
|
Add a 'testEmail' email type
|
2017-01-17 10:52:04 +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 |
|
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 |
|