Shane Kilkelly
|
b0dd7475b0
|
fix pug syntax
|
2017-01-31 14:57:22 +00:00 |
|
Shane Kilkelly
|
83d0f26011
|
Merge branch 'master' into sk-pug
|
2017-01-31 10:18:53 +00:00 |
|
James Allen
|
ca11f5fa18
|
Merge pull request #400 from sharelatex/ja-goto-code-from-rp
Jump to code when clicking on review panel entries
|
2017-01-31 10:49:13 +01:00 |
|
Shane Kilkelly
|
e2a207d618
|
Merge branch 'master' into sk-pug
|
2017-01-31 09:39:06 +00:00 |
|
James Allen
|
e7efa40c75
|
Merge pull request #401 from sharelatex/ja-spam-code-fixes
Refactor rate limiting code around sending invites
|
2017-01-31 10:21:55 +01:00 |
|
Shane Kilkelly
|
21986694d8
|
update gitignore
|
2017-01-30 15:13:03 +00:00 |
|
James Allen
|
9663df3457
|
Jump to text when clicking change icon as well
|
2017-01-30 16:00:32 +01:00 |
|
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
|
ad054dfef1
|
Merge pull request #402 from sharelatex/ja-track-changes
Ja track changes
|
2017-01-30 10:35:48 +01:00 |
|
James Allen
|
30618d33db
|
Add in extra check to set ui state
|
2017-01-27 17:13:11 +01:00 |
|
James Allen
|
d9b774bb9b
|
Sycn track changes based on doc state, not editor state
|
2017-01-27 17:12:17 +01:00 |
|
James Allen
|
ff7c5a0954
|
Merge branch 'master' into ja-track-changes
|
2017-01-27 17:11:49 +01:00 |
|
James Allen
|
b086d7afa2
|
Refactor rate limiting code around sending invites
|
2017-01-27 16:26:58 +01:00 |
|
Paulo Reis
|
15ad3f4769
|
Avoid stopping propagation, check event target instead.
|
2017-01-26 16:11:02 +00:00 |
|
James Allen
|
68aab6e05c
|
Don't use code check on .bib files
|
2017-01-26 16:13:21 +01:00 |
|
James Allen
|
0479b01b9d
|
Jump to code when clicking on review panel entries
|
2017-01-26 16:04:08 +01:00 |
|
Paulo Reis
|
ce89714a48
|
Emit event when textarea resizes; capture it in the review panel and trigger reflow.
|
2017-01-26 14:35:01 +00:00 |
|
James Allen
|
76328ff93f
|
Tell other clients when threads are deleted
|
2017-01-26 15:12:59 +01:00 |
|
James Allen
|
abb4ef14d8
|
Streamline the update/rendering process to not do extra work
|
2017-01-26 15:08:30 +01:00 |
|
Paulo Reis
|
6304c213bd
|
Add a min-height to the review panel text areas.
|
2017-01-26 12:00:11 +00:00 |
|
Paulo Reis
|
1a1320b561
|
Avoid shrinking the expandable text area.
|
2017-01-26 11:59:55 +00: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 |
|
James Allen
|
406181b05d
|
Remove a console.log
|
2017-01-25 15:49:38 +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 |
|
Shane Kilkelly
|
60500bc4ea
|
update shrinkwrap
|
2017-01-25 10:52:08 +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 |
|
Paulo Reis
|
f11926d0a9
|
Make sure layout math is done on load.
|
2017-01-25 10:31:02 +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 |
|
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 |
|
Henry Oswald
|
2341a8481a
|
Merge branch 'master' into ho-promote-case-study
|
2017-01-24 14:49:35 +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
|
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 |
|