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
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
Brian Gough
962a4d5039
roll out math mode linter for all users
...
from our ace commit 953ff92c3283f03da94559d50a933fe685b05631
2017-01-16 09:17:38 +00:00
Henry Oswald
fed88504f8
rate limit emails sent sharing projects by users
2017-01-14 14:52:32 +00:00
Paulo Reis
1ed0ccf854
Improve hovering behaviour for entries in mini mode.
2017-01-13 16:07:08 +00:00
Shane Kilkelly
25956d4c62
Fix up tests
2017-01-13 16:04:26 +00:00
Paulo Reis
3968761ac8
Add collapsing behaviour to resolved comments.
2017-01-13 15:37:24 +00:00
Paulo Reis
5eece9f5d9
Add collapsing behaviour to long entries.
2017-01-13 15:30:31 +00:00
Shane Kilkelly
1ef1912cf8
Point to fork of rolling-rate-limiter
that supports ioredis
2017-01-13 15:21:05 +00:00
James Allen
b6ea338ff8
Separate resolved comments so they don't affect review panel
2017-01-13 15:27:45 +01:00
Shane Kilkelly
525e871d55
Merge branch 'master' into sk-rate-limit-cluster
2017-01-13 14:17:18 +00:00
James Allen
bf7038f506
Adapt review panel line height to editor
2017-01-13 14:52:08 +01:00
James Allen
718f3dc388
Fix slightly broken callout positioning behaviour
2017-01-13 14:30:04 +01:00
James Allen
6c49b95538
Don't allow overlapping comments
...
Note that this is only a 'soft' don't allow. You could resolve a comment, comment in the same area,
and get them to overlap. It's not a problem if they overlap, just a bit ugly UI wise
2017-01-13 14:17:47 +01:00
James Allen
aab4dea8ae
Merge branch 'master' into ja-track-changes
2017-01-13 13:46:01 +01:00
Paulo Reis
823c2c854a
Add styling to have left-based layout when there is no space on the right.
2017-01-12 17:06:08 +00:00
Paulo Reis
3d5691ddaf
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-12 16:49:56 +00:00
Paulo Reis
e3e8541a63
Add class when review panel should layout to the left.
2017-01-12 16:49:47 +00:00
Paulo Reis
9f008318cc
Emit event after linking the layout directive.
2017-01-12 16:49:29 +00:00
James Allen
b31d086330
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-12 17:22:18 +01:00
James Allen
2052ee63a3
Recover tracked changes after a disconnect
2017-01-12 17:19:19 +01:00
Paulo Reis
b97ce52c6f
Handle z-index issues with mini review panel.
2017-01-12 14:20:41 +00:00
Brian Gough
a153375688
Merge pull request #391 from sharelatex/bg-syntax-checker-mathmode
...
math mode syntax checking improvements
2017-01-12 14:18:11 +00:00
Brian Gough
df4b5c1b37
math mode syntax checking improvements
...
for beta users
from our ace commit 442a1c522c58b1e511d2fd2c6f03909488d41e60
2017-01-12 13:25:19 +00:00
Shane Kilkelly
d17483fd47
Merge branch 'sk-top-menu-rework'
2017-01-12 13:24:47 +00:00
James Allen
a42cc48be8
Fix doc names and sort order in resolved comments dropdown
2017-01-12 13:44:54 +01:00
James Allen
8e0c2ff0b3
Adjust resolved comments buttons and add tooltip
2017-01-12 13:37:44 +01:00
Henry Oswald
daee77f052
Merge pull request #387 from sharelatex/pr-email-template-improvements
...
Email template improvements
2017-01-12 12:34:35 +00:00
James Allen
f9b8ada215
track changes for anonymous users
2017-01-12 13:29:57 +01:00
James Allen
0d02b860d9
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-12 13:08:57 +01:00
Paulo Reis
0b57cc650b
Fix merge mistake; adjust animation timings.
2017-01-12 11:56:04 +00:00
James Allen
64b9fe52dd
Handle deleted users in comments gracefully
2017-01-12 12:31:01 +01:00
Paulo Reis
88b694f894
Animate comment resolving.
2017-01-12 11:25:36 +00:00
James Allen
9a867438b2
Always show user name next to comment
2017-01-12 12:06:02 +01:00
James Allen
ea7f1abb6b
Darken comment reply text area
2017-01-12 12:05:50 +01:00
James Allen
6cd8e2a935
Add user data to comments correctly
2017-01-12 12:05:35 +01:00
James Allen
e7ab92b7c9
Only show users controls they have permission to use
2017-01-12 11:52:39 +01:00
James Allen
953371ad2d
Don't double track a reject
2017-01-12 10:59:16 +01:00
Shane Kilkelly
5c25d15a18
WIP: try switch to rolling rate limiter
2017-01-12 09:25:18 +00:00
James Allen
0264efccae
Don't let review panel entries go off the top of the screen
2017-01-11 14:57:00 +01:00
James Allen
a081ae7307
Properly sync resolved comments dropdown to entries
2017-01-11 14:13:49 +01:00
James Allen
4ee4aa9f0a
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-11 13:41:16 +01:00
James Allen
2e5c6d4570
Don't remove add comment marker when updating entries
2017-01-11 13:41:07 +01:00
Paulo Reis
d701c1ef5e
Make the dropdown scrollable.
2017-01-11 11:25:18 +00:00
Paulo Reis
931187bd8b
Add a backdrop to the dropdown (to close when clicked outside).
2017-01-11 10:53:46 +00:00
Shane Kilkelly
411cb4330c
Fix typo in hyperlink
2017-01-11 10:39:34 +00:00
Shane Kilkelly
731f280e2e
Move auth parts of top menu out of config and into web templates.
...
Move the remaining configuration into a new config var: `nav.header_extras`.
Add a `nav.showSubscriptionLink` var to control visibility of subscription link
in the Account menu.
This will allow admins to more easily configure extra links in the top
navigation bar, without the danger of overwriting the important auth menus.
2017-01-11 10:27:38 +00:00
Paulo Reis
72baed60ef
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-10 16:29:36 +00:00
Paulo Reis
010612aacc
Keep track of resolved threads in the dropdown.
2017-01-10 16:29:27 +00:00
James Allen
f17ce2705c
Don't include wrapper for resolved comments, since it throws the review panel layout off
2017-01-10 17:17:07 +01:00