James Allen
|
11a104ef96
|
Move spelling marker to back marker layer where it is updated properly by Ace
|
2017-02-07 15:55:00 +01:00 |
|
James Allen
|
c1a2779d9e
|
Merge branch 'master' into ja-fix-cursor-on-resize
|
2017-02-07 15:27:01 +01:00 |
|
James Allen
|
d00619ff3d
|
Keep the cursor in the same position on screen when the editor resizes
|
2017-02-07 15:23:44 +01:00 |
|
Paulo Reis
|
73835f004d
|
Add onboarding-related assets.
|
2017-02-07 14:13:25 +00:00 |
|
Shane Kilkelly
|
1d09fe2861
|
Merge branch 'sk-fix-password-set'
|
2017-02-07 09:17:56 +00:00 |
|
James Allen
|
1b06af766d
|
Merge pull request #406 from sharelatex/pr-expandable-text-area-fixes
Expandable text area fixes
|
2017-02-07 09:04:10 +01:00 |
|
James Allen
|
c97ded201f
|
Merge pull request #408 from sharelatex/ja-track-changes
Clear selection after creating a comment
|
2017-02-07 08:55:39 +01:00 |
|
Shane Kilkelly
|
6a161b4071
|
remove commented out code
|
2017-02-06 16:35:52 +00:00 |
|
Shane Kilkelly
|
7d5dc34b3e
|
fix the set-password form for new (admin-created) users
|
2017-02-06 14:58:54 +00:00 |
|
Paulo Reis
|
38e1b66fdc
|
Use slightly slower video.
|
2017-02-06 14:06:08 +00:00 |
|
Paulo Reis
|
31102d30da
|
Update prompt title.
|
2017-02-06 12:24:20 +00:00 |
|
Joe Green
|
a32ec78a54
|
added about image for jg
|
2017-02-06 11:59:32 +00:00 |
|
James Allen
|
6e39824e41
|
Fix language icons in language recommendation
|
2017-02-03 16:31:42 +01:00 |
|
Paulo Reis
|
d19cb2a31b
|
Fix border-radius in entries.
|
2017-02-03 15:20:50 +00:00 |
|
James Allen
|
4a80f0de5a
|
Clear selection after creating a comment
|
2017-02-03 15:09:40 +00:00 |
|
James Allen
|
935847f2a1
|
Add track changes flag into user model
|
2017-02-03 14:47:04 +01:00 |
|
James Allen
|
343abfde23
|
Use user feature flags to determine track changes state
|
2017-02-03 14:36:11 +01:00 |
|
James Allen
|
27c48f3790
|
Clear selection after creating a comment
|
2017-02-03 14:17:09 +01:00 |
|
Paulo Reis
|
6ef8d2d46d
|
Merge branch 'master' into pr-expandable-text-area-fixes
|
2017-02-02 14:38:09 +00:00 |
|
Paulo Reis
|
9d1d2df977
|
Disable mocked feature flag behaviour.
|
2017-02-02 12:19:44 +00:00 |
|
Paulo Reis
|
8f9e43f339
|
Handle track changles toggling when the feature is not enabled.
|
2017-02-02 12:12:14 +00:00 |
|
Paulo Reis
|
f50967295d
|
Support disabling the review-panel toggle, like a standard checkbox.
|
2017-02-02 12:08:17 +00:00 |
|
Paulo Reis
|
fe33fa1f65
|
Add modal controller.
|
2017-02-02 10:19:00 +00:00 |
|
Paulo Reis
|
98b98005a6
|
Create and integrate track changes upgrade prompt.
|
2017-02-01 16:52:18 +00:00 |
|
Paulo Reis
|
ad3a30b1b3
|
Add track changes teaser assets.
|
2017-02-01 16:51:37 +00:00 |
|
Shane Kilkelly
|
5be65431f7
|
Fix sentry config
|
2017-02-01 10:55:01 +00:00 |
|
Shane Kilkelly
|
efdd777c89
|
Add a _headLinks block to layout
|
2017-01-31 15:43:53 +00:00 |
|
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
|
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
|
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
|
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 |
|
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 |
|