github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
4115 commits 3 branches 7 tags 206 MiB
Commit graph

2113 commits

Author SHA1 Message Date
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
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
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
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
Paulo Reis
a1435d13a3 Basic structure for the resolved comments dropdown. 2017-01-05 17:15:27 +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
259c589076 Add option to restrict invites to existing user accounts. 2016-12-20 09:54:42 +00:00
James Allen
988005e929 Send and get comments via the chat api 2016-12-16 16:42:41 +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
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
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
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
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
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
Paulo Reis
a00acd7458 Add animations and state toggling. 2016-12-05 15:32:38 +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
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
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
6e9458e9e1 wip 2016-11-29 14:38:25 +00:00
Shane Kilkelly
853dad95f3 After account delete, bounce to login after 1-second delay 2016-11-28 12:01:32 +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
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
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
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
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
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
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
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
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
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
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
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
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
James Allen
443d772866 Don't clear entries when switching files 2016-11-16 13:53:01 +00:00
James Allen
479ea83e36 Dump everything (unstyled) into the review panel 2016-11-16 13:51:30 +00:00
James Allen
711f282575 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-16 13:26:33 +00:00
Paulo Reis
f640c17d4d Add review panel substate toggling. 2016-11-16 12:31:47 +00:00
James Allen
b443c5d7dc Make mini review panel entries scroll and stack like main panel 2016-11-15 17:07:06 +00:00
James Allen
69692934a9 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-15 16:21:59 +00:00
James Allen
829ccb6641 Resize on toggling review panel 2016-11-15 16:21:45 +00:00
Paulo Reis
562d8626e4 Fix overflowing entries. 2016-11-15 16:20:06 +00:00
Paulo Reis
8a11c8c3ca Show add comment button when review panel is off. 2016-11-15 16:02:12 +00:00
Paulo Reis
f25e144a15 Update font awesome to v4.7. 2016-11-15 16:02:03 +00:00
James Allen
3b4670509a Remove left over debug logging 2016-11-15 15:51:15 +00:00
James Allen
09074f5413 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-15 15:48:17 +00:00
James Allen
4542d1094d Keep separate persistent change tracker for each doc 2016-11-15 15:48:12 +00:00
Paulo Reis
7bf55823b2 Hide review panel when there are no entries. 2016-11-15 15:04:29 +00:00
Paulo Reis
d0f451df2e Improve hover behaviour on review entries. 2016-11-15 12:23:39 +00:00
Henry Oswald
b9001f19e6 use indexOf not matches for searching for project by name 
matches treats string like regex so chars like ( break it
just doing a simple indexOf == -1 is fine for a string match

will also fix it for projects with . in name which do come up
 2016-11-15 11:41:14 +00:00
Henry Oswald
d87067bc2f Merge branch 'announcments' 2016-11-15 10:38:01 +00:00
Paulo Reis
b181115277 Basic review minimized state. 2016-11-15 10:34:39 +00:00
Paulo Reis
0c600ba9b8 Support overflowing panes in UI layout. 2016-11-15 10:34:19 +00:00
James Allen
c89579e1df Focus on the focused change 2016-11-14 12:47:46 +00:00
James Allen
d447ebe304 Add timeout around reply layout render 2016-11-14 11:49:34 +00:00
Paulo Reis
7201bde2a3 Add comment UI. 2016-11-14 11:19:00 +00:00
James Allen
d32a7d0a94 Only apply doc changes, not fold changes in undo manager 2016-11-14 09:44:59 +00:00
Henry Oswald
5a13ee1077 use anlaytis api 
- don’t talk to postgres
- show recent blog post announcments
- proxy all events to analytics api
 2016-11-11 17:03:09 +00:00
James Allen
747e14dffe Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-11 16:16:10 +00:00
Paulo Reis
3694754ca6 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-11 16:10:44 +00:00
Paulo Reis
d04d7f834e Adjustments in the threaded comments, mocked comments responses. 2016-11-11 16:10:26 +00:00
James Allen
9509e87dc1 Update entries in place and position via DOM attributes directly 2016-11-11 16:09:32 +00:00
James Allen
36b950ea30 Use evalAsync instead of timeout 2016-11-11 13:35:16 +00:00
Paulo Reis
6c5c1549b6 Add comment replies via enter keypress. 2016-11-11 10:51:32 +00:00
Paulo Reis
78e409593b Threaded comments. 2016-11-10 17:19:41 +00:00
Paulo Reis
8dcbb6ea4f Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-10 15:09:56 +00:00
Paulo Reis
c5e6ca5200 More entry styling. 2016-11-10 15:08:41 +00:00
Paulo Reis
997addf355 More entry header styling + entry body. 2016-11-10 12:35:35 +00:00
James Allen
e69b6da684 Stop deletes overlapping comments (but leads to occasional flickering) 2016-11-10 12:01:42 +00:00
James Allen
938a8c4894 Fix logic around not tracking rejections to changes 2016-11-10 10:58:55 +00:00
James Allen
812ee82af1 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 
Conflicts:
	app/views/project/editor/editor.jade
 2016-11-10 10:52:40 +00:00
James Allen
34b2b665a3 Accept and reject changes 2016-11-10 10:52:09 +00:00
Paulo Reis
950fc0179c Basic support for action icons. 2016-11-10 10:19:52 +00:00
James Allen
f62d95dd8c Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-09 17:11:02 +00:00
James Allen
2e719fc450 Start adding callouts in review panel 2016-11-09 17:10:58 +00:00
Paulo Reis
013df17192 Entry header layout. 2016-11-09 17:09:57 +00:00
Paulo Reis
f28119aacb Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel 2016-11-09 16:36:12 +00:00
Paulo Reis
341a092231 Merge + basic layout for entries. 2016-11-09 16:36:06 +00:00
James Allen
184b421b1f Show user name in comments 2016-11-09 16:34:23 +00:00
James Allen
b44f1cde10 Add user data into changes 2016-11-09 16:23:08 +00:00
Paulo Reis
e0fbb45844 Add colored borders. 2016-11-09 16:00:02 +00:00
Paulo Reis
19241e571f Distinguish between inserts and deletes in the entries repeater. 2016-11-09 15:58:03 +00:00
James Allen
c5532bd8a3 Add cancel buttons for comments 2016-11-09 15:51:40 +00:00
James Allen
1622269d1b Relayout review panel as needed 2016-11-09 15:46:47 +00:00
Paulo Reis
74ddd33bd9 Add colors to LESS file. 2016-11-09 15:39:01 +00:00
James Allen
6d7f4e9e6a Add basic comment replying 2016-11-09 15:25:41 +00:00
James Allen
707ed43a7d Very crude adding of comments 2016-11-09 14:50:58 +00:00
James Allen
446ca7212a Track timestamps of changes 2016-11-09 12:19:48 +00:00
James Allen
cd494f7866 Update ChangesTracker to handle delete edge case 2016-11-08 17:57:23 +00:00
James Allen
f68c615f61 Remove markers correctly 2016-11-08 17:47:54 +00:00
James Allen
084838926d Add in dashed line callouts for changes and comments 2016-11-08 17:31:08 +00:00
James Allen
4f8055d998 make sure line 1 changes don't hide under toolbar 2016-11-08 16:51:20 +00:00
James Allen
064ae1945a Toggle review panel and track changes with ui elements 2016-11-08 16:43:01 +00:00
James Allen
a907ec04fc Don't complain about comment markers when checking 2016-11-08 15:17:20 +00:00
James Allen
8c65cb5835 Track and highlight comment ranges 2016-11-08 15:12:25 +00:00
Shane Kilkelly
e85cb161b2 Merge branch 'sk-bug-can-invite-collaborator' 2016-11-07 15:10:21 +00:00
Brian Gough
f77ee597f4 Merge pull request #365 from sharelatex/bg-redirect-to-login-on-403 
redirect to login on 403
 2016-11-07 14:44:08 +00:00
Shane Kilkelly
2ff211ce2c Make sure the $scope.canAddCollaborators var is initialised at least once, outside of angular $watch. 2016-11-07 14:36:04 +00:00
James Allen
0b50623d51 Escape \ 2016-11-05 11:07:58 +00:00
James Allen
26f9ee7fd3 Escape \ 2016-11-05 11:07:07 +00:00
Brian Gough
f54bb9744a redirect to /login on failed requests 2016-11-04 16:03:18 +00:00
Brian Gough
307f08e6bb Merge pull request #363 from sharelatex/bg-lock-editor-when-connection-down 
lock editor when connection down
 2016-11-04 11:04:30 +00:00
Brian Gough
476de0118c Merge pull request #362 from sharelatex/bg-fix-saving-indicator 
fix saving indicator
 2016-11-04 11:02:32 +00:00
Brian Gough
d2ba575d85 note that acks are for our own ops 2016-11-04 10:55:46 +00:00
Brian Gough
c25395d80b fix links to wiki 2016-11-04 10:25:08 +00:00
Brian Gough
e1b54322ee fix whitespace 2016-11-04 10:18:33 +00:00
Paulo Reis
b7cf77eb62 Add GitHub-related teaser media. 2016-11-03 16:14:38 +00:00
Paulo Reis
cd0a9d922e Generalize and improve teaser styles. 2016-11-03 16:14:13 +00:00
Brian Gough
49a06f8489 modal for lost connection 2016-11-03 12:37:44 +00:00
Brian Gough
91a590ad0e update links from tender to wiki 2016-11-03 12:28:19 +00:00
Brian Gough
2a8efea29a use browser 'online' event to trigger reconnect 2016-11-03 12:28:19 +00:00
Brian Gough
87d8192d29 decrease reconnect ratelimit for user activity 2016-11-03 12:28:19 +00:00
Brian Gough
62b8c30d0b make pollSavedStatus more robust against failure 
check last ack timestamp and size of pending op

provide method to compute sharejs op size so we can check if pending
ops get too big
 2016-11-03 11:28:23 +00:00
James Allen
8763e444e9 Include aceDelta in error message 2016-11-03 11:23:27 +00:00
James Allen
091eb7e462 Merge branch 'master' into ja-review-panel 
Conflicts:
	public/coffee/ide.coffee
	public/stylesheets/app/editor.less
 2016-11-03 10:07:37 +00:00
Paulo Reis
140748d466 Remove text-shadow, use stricter box-shadow syntax. 2016-11-02 14:38:26 +00:00
Paulo Jorge Reis
74d8fb103b Merge pull request #358 from sharelatex/pr-latex-linter-onboarding 
Code-checker onboarding
 2016-11-02 13:58:06 +00:00
Henry Oswald
11a097c9a6 remove some old sixpack tests 2016-11-02 10:09:12 +00:00
Shane Kilkelly
a63f7685b8 Move the planCode logic for Collaborator into a helper function. 2016-11-02 09:56:33 +00:00
Paulo Reis
c18114bfeb Different strategy for highlighting the code-check setting. 2016-11-01 17:30:27 +00:00
Paulo Reis
c88cb4574e Support dismissing the dialog just with Enter. 2016-11-01 16:17:42 +00:00
Paulo Reis
a91de6c3a5 Fix animation for compatibility with display: flex. 2016-11-01 15:27:05 +00:00
Paulo Reis
79caa14385 Fix logic for showing the onboarding prompt. 2016-11-01 15:26:50 +00:00
Paulo Reis
4c94c027b8 Styles for better accomodating smaller resolutions. Vertically centering. 2016-11-01 14:52:10 +00:00
Brian Gough
b907620fc1 clean up whitespace 2016-11-01 12:19:29 +00:00
Brian Gough
2461c1b7be add more sl_console debugging to ConnectionManager 2016-11-01 12:19:29 +00:00
Brian Gough
e2c66e8d56 keep track of reconnect timer 2016-11-01 12:19:29 +00:00
Brian Gough
4da9008300 rate limit on reconnection attempts (cursor/click) 2016-11-01 12:19:29 +00:00