Commit graph

4409 commits

Author SHA1 Message Date
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