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
James Allen
3668d7dd1f
Remove global debugging hook
2017-01-10 16:58:59 +01:00
Shane Kilkelly
f5ced03074
Set redirect when sending user to login
page.
...
Allows smart redirecting to work when public access is turned off.
2017-01-10 15:42:36 +00:00
James Allen
f31fa98679
Sync track changes state between sessions and client
2017-01-10 16:11:12 +01:00
Shane Kilkelly
f3af44fab0
add on-success and on-error handlers to async-form.
2017-01-10 14:46:09 +00:00
James Allen
85c613e161
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-10 13:44:01 +01:00
James Allen
d03aa7056e
Rename /ranges/users end point to /changes/users
2017-01-10 13:43:53 +01:00
Paulo Reis
5bd49c08f8
Simpler resolved comments dropdown data structure.
2017-01-10 12:16:58 +00:00
Paulo Reis
9c7d89c5bd
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-10 11:23:15 +00:00
Paulo Reis
072044ee90
Remove thread from view collection; some clean-up.
2017-01-10 11:23:06 +00:00
James Allen
7ae33041b5
Don't enter infinite loop generating id
2017-01-10 11:58:55 +01:00
James Allen
12e1b2bc3d
Don't show resolved comments highlighted in the text
2017-01-10 11:55:59 +01:00
Paulo Reis
32fb317820
Add delete action to the dropdown.
2017-01-10 10:33:54 +00:00
Paulo Reis
70134d44d0
Add unresolve action to the dropdown.
2017-01-09 17:22:01 +00:00
James Allen
4e128b6ab7
Send user data in /threads dat
2017-01-09 17:25:06 +01:00
Paulo Reis
1a100b77df
Hide resolved comments from the review panel.
2017-01-09 15:15:03 +00:00
James Allen
35bdb4383a
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
...
Conflicts:
public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
2017-01-09 16:11:59 +01:00
James Allen
dbe5331566
Tell other clients when comments are resolved and reopened
2017-01-09 16:09:29 +01:00
Paulo Reis
037389b7dd
Decouple ranges update from the overview panel; integrate it with the dropdown.
2017-01-09 14:59:01 +00:00
James Allen
43f6b9de7c
Inform other clients when we accept a change
2017-01-09 15:54:12 +01:00
Paulo Reis
5e483f2a97
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-09 14:31:31 +00:00
James Allen
7e33d1a24e
Fix generation of thread id
2017-01-09 15:30:48 +01:00
Paulo Reis
f0ab1fa2d4
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-09 14:30:40 +00:00
Paulo Reis
4871d56725
Isolate overview panel overrides.
2017-01-09 14:30:29 +00:00
James Allen
9379cff89d
Add end point for accepting change in doc updater
2017-01-09 15:25:27 +01:00
James Allen
a4097b4709
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-09 10:52:01 +01:00
James Allen
14c624614d
Update RangesTracker
2017-01-09 10:51:55 +01:00
James Allen
ae30f32481
Use deterministic ids based on a seed
2017-01-09 10:49:03 +01:00
Paulo Reis
037b61cbba
Further styling.
2017-01-06 17:22:22 +00:00
Paulo Reis
0478fcd925
Add comment resolution info.
2017-01-06 15:24:33 +00:00
James Allen
cb24e9390a
Fix comments in overview panel
2017-01-06 14:17:57 +01:00
James Allen
beb94b0756
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-06 13:42:08 +01:00
James Allen
3a5d45fa32
Get user info via web, not chat
2017-01-06 13:41:58 +01:00
Paulo Reis
42585085c0
Integrate new directive, plumb data into it. More styling.
2017-01-06 12:00:17 +00:00
Paulo Reis
f2e6e69df6
Add an entry directive for resolved comments, with file and quoted text.
2017-01-06 11:59:49 +00:00
Henry Oswald
0b67265eb6
use admin email for closed site
2017-01-06 11:32:57 +00:00
Henry Oswald
84ce2d0e14
change default nav to use translations for login and register
2017-01-06 11:00:21 +00:00
Paulo Reis
a1435d13a3
Basic structure for the resolved comments dropdown.
2017-01-05 17:15:27 +00:00
Henry Oswald
862e15b842
log out user id and anonymous when loading editor
2017-01-05 15:02:10 +00:00
Paulo Reis
22db36d21b
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-05 11:51:00 +00:00
Paulo Reis
d13035a4f4
Simpler UI for comments; remove some unused code.
2017-01-05 11:50:43 +00:00
James Allen
5155ebaeec
Don't show resolved comments when loading editor
2017-01-05 10:55:16 +01:00
James Allen
898d20a6fc
Fix signature of call to unresolveComment
2017-01-05 10:34:28 +01:00
Paulo Reis
1599c41670
Sizing adjustments.
2017-01-04 15:34:24 +00:00
James Allen
60152e219b
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-04 16:26:08 +01:00
James Allen
84d9b2aa49
Save resolve and reopened state
2017-01-04 16:26:02 +01:00
Paulo Reis
fdafcf9677
Restyle insertions and deletions - increasing info density.
2017-01-04 15:24:49 +00:00
Shane Kilkelly
7bbbfe20b9
If external auth is used, remove /register
items from header nav.
...
(logic moved from docker-image settings file)
2016-12-21 13:50:13 +00:00
Shane Kilkelly
259c589076
Add option to restrict invites to existing user accounts.
2016-12-20 09:54:42 +00:00
Shane Kilkelly
822f76a883
Add unit tests for RedisWrapper
2016-12-19 15:12:22 +00:00
Shane Kilkelly
d428f9adbc
Make LoginRateLimiter
a thin wrapper around RateLimiter
2016-12-19 14:10:51 +00:00
Shane Kilkelly
03b541fb64
Fix small mistakes
2016-12-19 14:10:27 +00:00
Shane Kilkelly
535e489ae5
Add an example redis.ratelimiter
config.
2016-12-19 12:17:58 +00:00
Shane Kilkelly
9f787943b6
Remove stray redis imports.
2016-12-19 12:17:23 +00:00
Shane Kilkelly
ef0a5801d5
Create a RedisWrapper, and use it for rate limiting.
2016-12-19 12:17:02 +00:00
Paulo Reis
d6fcc21ab5
Add support for GMail go-to actions in the single CTA template.
2016-12-16 17:04:26 +00:00
James Allen
988005e929
Send and get comments via the chat api
2016-12-16 16:42:41 +00:00
Paulo Reis
869f729132
Fix forgotten templating function.
2016-12-16 15:15:06 +00:00
Paulo Reis
ca5040882f
Use the new template in the join group email.
2016-12-16 14:57:59 +00:00
Brian Gough
3a8a12fcb3
Revert "rollout linter math mode to all users"
...
This reverts commit 0ac0a11d3028cabac53d1e347b2509cb9e785f9f.
2016-12-16 14:07:47 +00:00
Paulo Reis
0fe3664a82
Use the new template in the reset pwd email.
2016-12-16 12:16:45 +00:00
Paulo Reis
2234c438a1
Support a secondary message in the single CTA email template.
2016-12-16 12:16:33 +00:00
Shane Kilkelly
637fcb5784
Merge branch 'master' into sk-learn-anchor-links
2016-12-16 11:20:43 +00:00
Shane Kilkelly
fdcf97f877
Disable angular html5Mode.
2016-12-16 10:26:25 +00:00
Paulo Reis
7dfc2c61a6
Make the CTA button text configurable.
2016-12-16 10:06:56 +00:00
Paulo Reis
47a5eb5382
Add a new layout and body template for e-mails.
2016-12-15 17:22:39 +00:00
Shane Kilkelly
faf740d224
Disable link rewriting.
2016-12-15 16:23:10 +00:00
Brian Gough
2583a28087
rollout linter math mode to all users
...
ace repo commit 21dde1e5f104b02e19534e56d7eb2dbd3a950db9
2016-12-15 13:28:00 +00:00
James Allen
5717cafcec
Create comments via comment ops
2016-12-13 17:57:46 +00:00
James Allen
898277b4af
Refactor ops model so it all happens in Document
2016-12-13 17:34:29 +00:00
Paulo Jorge Reis
a772b268aa
Merge pull request #385 from sharelatex/pr-style-announcements
...
Announcements styling
2016-12-12 15:19:40 +00:00
Brian Gough
3a7731b33b
Merge pull request #384 from sharelatex/bg-syntax-checker-mathmode
...
update latex syntax checker to include mathmode
2016-12-12 15:09:45 +00:00
Brian Gough
6e8ee826dc
update latex syntax checker to include mathmode
...
from our ace commit 21dde1e5f104b02e19534e56d7eb2dbd3a950db9
provide it as a beta release first
2016-12-12 10:10:49 +00:00
James Allen
0a6a6c3c28
Keep files ordered in overview panel in the same was as the file tree
2016-12-09 16:17:28 +00:00
James Allen
293ba1fc4c
Fetch all ranges from docstore when viewing overview panel
2016-12-09 15:43:08 +00:00
James Allen
1d426e538f
Load ranges from docupdater and toggle track changes when possible
2016-12-08 14:10:30 +00:00
James Allen
1830d41eba
Proxy ranges between doc updater and docstore
2016-12-08 14:09:06 +00:00
Paulo Reis
42bd1852c6
Use HTML binding in the excerpt.
2016-12-07 15:45:22 +00:00
Paulo Reis
58ab888f3f
Add a button to show all, when filtering new items.
2016-12-07 14:57:54 +00:00
Paulo Reis
c716b86def
Add logic to dismiss unread announcements, styling fixes.
2016-12-07 14:26:10 +00:00
Henry Oswald
e6eeb86046
add read property to announcments
2016-12-07 11:39:22 +00:00
Paulo Reis
3595aff5e2
Scrolling behaviour.
2016-12-07 11:10:02 +00:00
Paulo Reis
821e556dd3
Better handling of overflowing content.
2016-12-06 17:15:56 +00:00
Paulo Reis
c1355e64b3
Merge branch 'master' into pr-style-announcements
2016-12-06 15:42:24 +00:00
Paulo Reis
5d9ae25282
Allow announcements to overflow the header.
2016-12-06 15:41:58 +00:00
Paulo Reis
6a9ab1f525
Style adjusments; make announcements close when backdrop is clicked.
2016-12-06 14:17:30 +00:00
Shane Kilkelly
a5d2183441
if Recurly error, parse body xml rather than using regex match
2016-12-06 10:39:59 +00:00
Shane Kilkelly
58280bf6ee
Merge branch 'master' into sk-user-delete-with-cancelled-sub
2016-12-06 09:31:42 +00:00
Paulo Reis
a00acd7458
Add animations and state toggling.
2016-12-05 15:32:38 +00:00
James Allen
48cc5a992f
Merge branch 'master' into ja-set-version-in-docstore
2016-12-01 09:30:53 +00:00
Shane Kilkelly
e03d16e0cd
Deleting user: if subscription is already cancelled, ignore and proceed.
2016-11-30 16:03:18 +00:00
James Allen
dcc9a5de32
Merge pull request #382 from sharelatex/sk-spellcheck-underline-retina
...
Sk spellcheck underline retina
2016-11-30 15:51:34 +00:00
James Allen
34276520d8
Merge pull request #379 from sharelatex/sk-show-user-email
...
Add a `user_email` option to the nav "Account" dropdown.
2016-11-30 15:49:34 +00:00
Shane Kilkelly
e081409b09
Update to modern images
2016-11-30 14:34:50 +00:00
Shane Kilkelly
ef115e2f91
add a 2x version of the spellcheck-underline image.
2016-11-30 11:25:47 +00:00
Shane Kilkelly
d38890e9f4
Add the rolling
option to session
2016-11-30 09:41:58 +00:00
James Allen
eb648b9bc8
Proxy version number to and from docstore
2016-11-29 17:16:56 +00:00
Paulo Reis
73e0a63689
Basic mark-up and styles. Change the controller to hold all notifications.
2016-11-29 17:12:53 +00:00
Shane Kilkelly
cf94429e05
Add a user_email
option to the nav "Account" dropdown.
2016-11-29 16:04:20 +00:00
Henry Oswald
68ddf04fe8
to string record event check
2016-11-29 14:38:45 +00:00
Henry Oswald
6e9458e9e1
wip
2016-11-29 14:38:25 +00:00
Henry Oswald
aacdb1e96b
to string record event check
2016-11-28 19:19:00 +00:00
Shane Kilkelly
a03ac8fe72
More robust session destruction after deleting user account.
2016-11-28 12:37:53 +00:00
Shane Kilkelly
853dad95f3
After account delete, bounce to login after 1-second delay
2016-11-28 12:01:32 +00:00
Shane Kilkelly
d15659ed85
check user is present before accessing email
2016-11-28 12:01:11 +00:00
Shane Kilkelly
52462d7020
Merge branch 'sk-sync-details-from-sso'
2016-11-28 10:11:59 +00:00
Shane Kilkelly
395135a655
Merge branch 'sk-post-login-redirect'
2016-11-28 09:52:14 +00:00
Shane Kilkelly
acce8853ba
Remove redundant baseUrl
from plans page.
2016-11-25 15:24:50 +00:00
Shane Kilkelly
2ab5ad4230
If we're updating details from a SSO source, don't allow editing on settings page.
2016-11-25 14:38:00 +00:00
Henry Oswald
4b59fdd453
added missing settings file to announcments controller
2016-11-25 11:59:50 +00:00
Henry Oswald
f130470971
log ip address of user when logging in
2016-11-25 11:59:50 +00:00
James Allen
65c1a62cb7
Add in null check for user when getting hue in chat
2016-11-25 11:08:32 +00:00
James Allen
04c151eed0
Only bind to Ace if track changes is enabled
2016-11-24 16:56:50 +00:00
Paulo Reis
ecd81738cb
Restyle toggle.
2016-11-24 15:55:09 +00:00
Shane Kilkelly
167f01857a
Remove stray next
params.
2016-11-24 14:15:01 +00:00
Shane Kilkelly
4cc4a4e264
Merge branch 'master' into sk-post-login-redirect
2016-11-24 14:02:38 +00:00
Shane Kilkelly
22101d0305
If user is sent to login page with explicit redirect, obey
2016-11-24 11:38:13 +00:00
Paulo Reis
bf5aa5e253
Fix review panel toolbar in flex contexts.
2016-11-23 17:04:55 +00:00
Paulo Reis
1148b00c9a
Add review header item.
2016-11-23 16:53:13 +00:00
Paulo Reis
8d933d9b5f
Toggler style adjustments.
2016-11-23 16:10:35 +00:00
Paulo Reis
f61aac0bb3
Make toggler label clickable.
2016-11-23 14:44:04 +00:00
Paulo Reis
e655e85e6d
Integrate toggler in review panel.
2016-11-23 14:34:55 +00:00
Paulo Reis
aba6c90524
Add styling for toggler.
2016-11-23 14:34:40 +00:00
Paulo Reis
ed20f8533f
Add toggler directive.
2016-11-23 14:34:21 +00:00
Paulo Reis
ba5118d02a
Merge branch 'master' into ja-review-panel
2016-11-23 10:41:20 +00:00
Paulo Jorge Reis
ff0a5395e5
Merge pull request #374 from sharelatex/pr-wrap-ab-test-header
...
PR Wrap header labels AB test
2016-11-23 09:49:53 +00:00
Shane Kilkelly
cee3326ce3
fix omission of 'length'
2016-11-22 17:06:05 +00:00
Shane Kilkelly
f9b1862ddb
Merge branch 'master' into sk-post-login-redirect
2016-11-22 16:54:12 +00:00
Shane Kilkelly
8a4352fff2
Set redirect when redirecting from restricted
2016-11-22 16:54:03 +00:00
Shane Kilkelly
2edd75de96
Allow the 500/Error page to render, even if res.locals aren't set up yet.
2016-11-22 16:48:13 +00:00
James Allen
33f6c0dd1b
Jump to position based on offset since we don't know doc lines for unopen docs
2016-11-22 16:34:39 +00:00
Shane Kilkelly
8089bb55a4
use session for the post-login redirect, remove redir
query string.
2016-11-22 14:24:36 +00:00
Paulo Reis
0bc52412ea
Hide header labels in XS resolutions (i.e. up to 768px).
2016-11-22 10:59:20 +00:00
Paulo Reis
fab7ec3e98
Remove test-related tracking and analytics code.
2016-11-22 10:50:29 +00:00
Paulo Reis
dce272462a
Remove test-related mark-up.
2016-11-22 10:39:56 +00:00
Paulo Reis
decaaab7ea
Fix CSS property typo.
2016-11-22 10:36:13 +00:00
Paulo Reis
f7d2fa9382
Avoid avatar resizing in flexbox contexts.
2016-11-22 09:03:52 +00:00
Paulo Reis
a84e52bc92
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-21 17:14:08 +00:00
James Allen
db93bc8cff
Grey out and add extra info to resolved comments
2016-11-21 17:13:17 +00:00
Paulo Reis
9a4ee0470a
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-21 16:58:22 +00:00
James Allen
aa831159a2
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-21 16:58:02 +00:00
James Allen
222401c7fd
Pull out logic linking changesTracker to reviewPanel.entries into ReviewPanelController
2016-11-21 16:57:52 +00:00
Paulo Reis
319217f61e
Revert "Basic support for buttons in overview panel."
...
This reverts commit c76e73489ac989dc0e90f65312b737831850af96.
2016-11-21 16:40:31 +00:00
Paulo Reis
80049f4e9c
Basic support for buttons in overview panel.
2016-11-21 15:20:58 +00:00
James Allen
d77c385cf0
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-21 15:19:02 +00:00
James Allen
12168b2ae8
Insert some mocked changes
2016-11-21 15:18:46 +00:00
Paulo Reis
5158c6c16d
Fix padding in overview panel.
2016-11-21 15:05:18 +00:00
Paulo Reis
fc6730f5bf
Lower brightness in smaller username text spans; limit avatar text to 1 char.
2016-11-21 14:51:01 +00:00
Brian Gough
889d8f51c4
make Document _onError handler more robust
...
replace console.error with sl_console.log to prevent browser crashing
before exiting document if console object does not exist.
2016-11-21 13:58:08 +00:00
Paulo Reis
ad857a15f9
Style resolved comments in the current file pane.
2016-11-21 11:16:23 +00:00
Paulo Reis
cc8fdf6b8d
Add a buttons mixin.
2016-11-21 11:16:13 +00:00
James Allen
5814d93f5e
Order entries in the overview panel based on their place in the document
2016-11-18 16:30:41 +00:00
James Allen
6ea61472ec
Add tooltip to add comment indicator
2016-11-18 16:08:02 +00:00
James Allen
107f86fb2b
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-18 15:47:06 +00:00
James Allen
c5e7d154fd
Improve undo behaviour of deletes
2016-11-18 15:46:54 +00:00
Paulo Reis
f029c7a7b2
Control click behaviour on comments; relayout when toggling panels.
2016-11-18 15:08:16 +00:00
Paulo Reis
caefc196a4
Style comments in Overview panel.
2016-11-18 14:27:49 +00:00
Paulo Reis
d1b96cea35
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-18 12:16:33 +00:00
Paulo Reis
60b5087763
Basic styling in the overview panel.
2016-11-18 12:16:24 +00:00
Shane Kilkelly
da1be67aff
Merge branch 'sk-ext-auth-show-email'
2016-11-18 09:34:05 +00:00
James Allen
5d8038af71
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-17 18:06:31 +00:00
James Allen
bf20799478
Allow comments to be resolved an deleted
2016-11-17 18:06:08 +00:00
Paulo Reis
dd0c578924
Put the entries in a layer above the scrollbar.
2016-11-17 17:18:24 +00:00
Paulo Reis
a007da0466
Increase hit area for hovering in the mini review panel.
2016-11-17 16:53:59 +00:00
James Allen
d30daa3477
Remove another debug logging line
2016-11-17 16:08:25 +00:00
James Allen
35d154b6e8
Remove some debug logging lines
2016-11-17 16:07:23 +00:00
James Allen
d07fcbca82
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-17 16:05:44 +00:00
James Allen
7a8af8a21a
Show file names in overview panel
2016-11-17 16:05:12 +00:00
Paulo Reis
68c254a432
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-17 15:55:26 +00:00
James Allen
4a93e02407
Goto a change when clicked in the overview panel
2016-11-17 15:55:18 +00:00
Paulo Reis
b1f73963b9
Fix invisible hover.
2016-11-17 15:41:55 +00:00
James Allen
dcb4bd0dc8
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-17 15:33:42 +00:00
James Allen
d1a3ff4b73
Refactor callout and background styles and don't show in overview
2016-11-17 15:33:34 +00:00
Paulo Reis
94bdad7eae
Use triangles mixin instead of characters.
2016-11-17 15:29:33 +00:00
Shane Kilkelly
6606375cd7
Remove dead code: SessionInvalidator
2016-11-17 15:27:58 +00:00
James Allen
77400b000b
Focus on box when adding a comment
2016-11-17 15:20:25 +00:00
James Allen
7c3a4dfa4d
Always show current file in mini review panel
2016-11-17 14:57:11 +00:00
Shane Kilkelly
fa146a1558
Remove redundant !!
2016-11-17 14:48:15 +00:00
Shane Kilkelly
9bd7c2d827
Merge branch 'master' into sk-ext-auth-show-email
2016-11-17 14:35:02 +00:00
Paulo Reis
df420e0d21
Remove deprecated event handlers, conditionally add the new ones in the Ace wrapper directive.
2016-11-17 14:34:23 +00:00
Shane Kilkelly
3b8fbe8249
If using external auth, show non-editable email field.
...
Also defend server-side against setting email when using external auth.
2016-11-17 14:34:02 +00:00
James Allen
15d8f6c661
Sort out scroll bar positions and scroll position transitions
2016-11-17 14:29:35 +00:00
Brian Gough
a2a760afce
add missing pdfjs charmaps
2016-11-17 14:17:56 +00:00
James Allen
52ca272ae8
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-17 12:09:10 +00:00
James Allen
e2f21a67d2
Sort of positioning and scrolling of overview panel
2016-11-17 12:09:07 +00:00
Paulo Reis
fe43f60b3d
Offset review panel when Ace scrollbar is visibl.e
2016-11-17 12:02:45 +00:00
James Allen
2678a177fe
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-17 11:47:28 +00:00
James Allen
1e8f2a89a1
Refactor layout and CSS to be more manageable with overview classes
2016-11-17 11:47:20 +00:00
Paulo Reis
4bba8e8977
Remove deprecated event handlers, conditionally add the new ones in the Ace wrapper directive.
2016-11-17 10:51:17 +00:00
Paulo Reis
f170fd4b83
Refactor Ace directive to have a single events bridge.
2016-11-17 10:40:08 +00:00
James Allen
a87ed88a53
Use cleaner scrolling system that doesn't involve hiding a scroll bar
2016-11-17 10:24:48 +00:00
James Allen
70bf0be6dd
Fix when the mini review panel is hidden
2016-11-16 17:17:50 +00:00
James Allen
1cec41d2cf
Resize editor on review panel toggle
2016-11-16 16:28:01 +00:00
James Allen
c86cf5a61a
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-16 16:23:15 +00:00
James Allen
2f136c15c3
Don't draw our hacked zero width markers when they are offscreen
2016-11-16 16:22:59 +00:00
Paulo Reis
706b0793ab
Pull callouts into entries directives.
2016-11-16 16:21:24 +00:00
Paulo Reis
296fd9fe26
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-16 16:13:49 +00:00
Paulo Reis
32b3ba6bbb
Pull indicators into entries directives.
2016-11-16 16:13:39 +00:00
James Allen
a4b9bcb37e
Don't let focused change overlap nav panel
2016-11-16 16:07:07 +00:00
James Allen
6a4bf3885d
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
...
Conflicts:
public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
2016-11-16 16:05:05 +00:00
James Allen
beab95a871
Reflow review panel layout when adding a comment
2016-11-16 16:03:06 +00:00
James Allen
5d414e9a1b
Tweak paddings in review panel
2016-11-16 15:57:51 +00:00
Paulo Reis
6153bd3022
Wrap add comment entries in a directive
2016-11-16 15:47:05 +00:00
Paulo Reis
24f82c3c35
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-16 15:34:49 +00:00
James Allen
fc3fd5c73c
Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel
2016-11-16 15:27:48 +00:00
James Allen
51afd49780
Bring scroll bar into editor when just mini review panel
2016-11-16 15:27:33 +00:00
James Allen
379afe4aa5
Refactor scroll handling into directive
2016-11-16 15:23:29 +00:00
Paulo Reis
00a6df156b
Wrap comment entries in a directive
2016-11-16 15:12:58 +00:00
Paulo Reis
9ffb05cd98
Wrap insert and delete entries in a directive
2016-11-16 14:56:34 +00:00
Brian Gough
50042ee97e
fix latex code check for minted
...
include minted in list of verbatim enviroment
2016-11-16 14:50:09 +00:00
Brian Gough
277894631a
try out new pdfjs font fix
...
https://github.com/mozilla/pdf.js/pull/7705
2016-11-16 14:50:09 +00:00
Paulo Reis
d7d21b106c
Isolate review-panel markup.
2016-11-16 14:42:07 +00:00
Shane Kilkelly
f9774141b1
Fix up makeRequest, so it copes with analytics.url
being un-configured.
2016-11-16 14:40:38 +00:00
James Allen
b006f4fbbf
Position boxes next to indicator icons in mini review panel
2016-11-16 14:14:53 +00:00
James Allen
56408728cd
fix initialization error
2016-11-16 14:00:29 +00:00