github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
4510 commits 3 branches 7 tags 199 MiB
Commit graph

1091 commits

Author SHA1 Message Date
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
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
2052ee63a3 Recover tracked changes after a disconnect 2017-01-12 17:19:19 +01:00
James Allen
a42cc48be8 Fix doc names and sort order in resolved comments dropdown 2017-01-12 13:44:54 +01: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
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
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
931187bd8b Add a backdrop to the dropdown (to close when clicked outside). 2017-01-11 10:53:46 +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
James Allen
f31fa98679 Sync track changes state between sessions and client 2017-01-10 16:11:12 +01: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
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
James Allen
84d9b2aa49 Save resolve and reopened state 2017-01-04 16:26:02 +01: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
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
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
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
8d933d9b5f Toggler style adjustments. 2016-11-23 16:10:35 +00:00
Paulo Reis
e655e85e6d Integrate toggler in review panel. 2016-11-23 14:34:55 +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
James Allen
db93bc8cff Grey out and add extra info to resolved comments 2016-11-21 17:13:17 +00:00
James Allen
222401c7fd Pull out logic linking changesTracker to reviewPanel.entries into ReviewPanelController 2016-11-21 16:57:52 +00:00
James Allen
12168b2ae8 Insert some mocked changes 2016-11-21 15:18:46 +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
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
James Allen
bf20799478 Allow comments to be resolved an deleted 2016-11-17 18:06:08 +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
7a8af8a21a Show file names in overview panel 2016-11-17 16:05:12 +00:00
James Allen
4a93e02407 Goto a change when clicked in the overview panel 2016-11-17 15:55:18 +00:00
James Allen
d1a3ff4b73 Refactor callout and background styles and don't show in overview 2016-11-17 15:33:34 +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
Paulo Reis
fe43f60b3d Offset review panel when Ace scrollbar is visibl.e 2016-11-17 12:02:45 +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
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
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
829ccb6641 Resize on toggling review panel 2016-11-15 16:21:45 +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
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
James Allen
d32a7d0a94 Only apply doc changes, not fold changes in undo manager 2016-11-14 09:44:59 +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
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
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
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
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
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
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
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 Jorge Reis
74d8fb103b Merge pull request #358 from sharelatex/pr-latex-linter-onboarding 
Code-checker onboarding
 2016-11-02 13:58:06 +00:00
Paulo Reis
c88cb4574e Support dismissing the dialog just with Enter. 2016-11-01 16:17:42 +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
Brian Gough
f894048292 fix lastUpdate in ConnectionManager 2016-11-01 12:19:29 +00:00
Brian Gough
d57e191ad0 use socket.io connect method instead of reconnect 
the reconnect method tries 10 times by default, but we want to manage
reconnections ourselves
 2016-11-01 12:06:41 +00:00
Brian Gough
69e957419d Merge pull request #355 from sharelatex/bg-handle-reconnects 
wait for confirmation before sending joinProject
 2016-11-01 11:50:44 +00:00
Paulo Reis
2c78b5967f Fix settings logic. 2016-11-01 11:36:05 +00:00
Brian Gough
35259bf9b7 send joinProject after connectionAccepted 2016-11-01 11:17:36 +00:00
Paulo Reis
aa58b70d43 Improve visibility logic. 2016-10-31 20:18:08 +00:00
James Allen
11c24377cb fix JSONstringifyWithCycles 2016-10-31 16:57:29 +00:00
James Allen
c2eb49845f Revert "Make very simple shallow copy of aceDelta when there's an undo error" 
This reverts commit 1d77a95f17dde6f8792bca1989d65952474b144c.
 2016-10-31 16:56:49 +00:00
James Allen
26410690da Make very simple shallow copy of aceDelta when there's an undo error 2016-10-31 16:47:13 +00:00
James Allen
8368577867 Merge branch 'master' into ja-review-panel 
Conflicts:
	app/views/project/editor/editor.jade
	public/coffee/ide.coffee
	public/coffee/ide/editor/directives/aceEditor.coffee
 2016-10-31 16:42:55 +00:00
Paulo Reis
97b92928dc Merge branch 'master' into pr-latex-linter-onboarding 2016-10-28 16:36:10 +01:00
Brian Gough
8887ab78c0 improve ace mode recognition 2016-10-27 15:42:19 +01:00
Shane Kilkelly
2029ec2535 Merge branch 'sk-plans-tidy' 2016-10-27 10:42:29 +01:00
Brian Gough
cb4380fa78 fix problem with setting syntax validation option 2016-10-26 15:08:29 +01:00
Shane Kilkelly
d912c3b487 Merge branch 'master' into sk-plans-tidy 2016-10-26 13:47:26 +01:00
James Allen
c9925a3590 Handle reporting of cyclic objects to Sentry 2016-10-26 11:34:05 +01:00
Paulo Reis
70c7880639 Style adjustments. 2016-10-26 11:12:34 +01:00
James Allen
032165c930 Merge pull request #349 from sharelatex/ja-real-time-reconnects 
Reconnect gracefully when asked to by real-time
 2016-10-26 10:04:25 +01:00
Paulo Reis
b913118e07 Save the syntax validation setting in the onboarding view. 2016-10-25 15:01:30 +01:00
Paulo Reis
f4849201aa Merge branch 'master' into pr-latex-linter-onboarding 2016-10-25 15:00:26 +01:00
Paulo Reis
238e07ddde Save syntax checking as a user setting. 2016-10-25 14:59:20 +01:00
James Allen
43aeb5a21d Clear SERVERID cookie when reconnecting gracefully 2016-10-25 14:09:36 +01:00
Shane Kilkelly
6069d4dba3 Merge branch 'master' into sk-plans-tidy 2016-10-25 13:14:44 +01:00
James Allen
52754e038a Reconnect gracefully when asked to by real-time 2016-10-24 16:36:40 +01:00
Paulo Reis
32d59b6212 Add setting saving logic. 2016-10-24 12:20:08 +01:00
Shane Kilkelly
d5a7514923 Add AB test for plans (+15 squashed commits) 
Squashed commits:
[45c2237] Add a `subscription-form-switch-to-student` event
[1ad9b8f] change experiment name, and re-enable switch-to-student workflow
[f7cdb78] Remove debug
[4b9778a] Incorporate collaborator alternative plans
[701e80b] Add collaborator plans for heron and ibis
[287aa0f] AB test plans from editor page
[c74052e] Fix change-plan view for default plans
[1a947d6] Use correct plan codes
[1eecda7] Adjust prices
[69c4c7b] Introduce two plans
[8b8d5f8] Rename sixpack experiment
[c332002] Fix up the change-plan page
[c7af52d] Overhaul change-plan page, show only plans from current generation
[33d86bf] update plan
[5bbd946] Add a basic plans AB test
 2016-10-21 16:17:37 +01:00
Paulo Reis
4d33b11ce5 Restrict the appearance of the onboarding view. 2016-10-21 15:00:52 +01:00
Paulo Reis
777b28b443 Add animation and other styling items. Small refactor with Less vars. 2016-10-21 12:02:53 +01:00
James Allen
2ac405e58c Allow track changes to be toggled on and off 2016-10-20 16:59:58 +01:00
Paulo Reis
ac07ba035b Navigation in onboarding UI. 2016-10-20 16:39:43 +01:00
Brian Gough
e9b5fc056d fold aceEditor resetSession into session set up 
it is not used elsewhere, and mode setting is now done during the
initialisation.
 2016-10-20 16:03:55 +01:00
Brian Gough
7258e947a8 use ace modelist extension to auto-detect mode 2016-10-20 16:03:19 +01:00
James Allen
60a81beb11 Try out different styling for highlights 2016-10-20 15:18:45 +01:00
James Allen
8f9a4882c8 Don't let widgets in review panel overlap 2016-10-20 15:04:10 +01:00
Brian Gough
84f986058a enable pdfjs cmaps in pdfRenderer 2016-10-20 12:55:58 +01:00
James Allen
2b94c69795 Don't use the trackChanges engine in the history editor panel 2016-10-20 12:19:57 +01:00
James Allen
52f3fe7303 Show different users changes in different colours 2016-10-20 12:15:22 +01:00
Brian Gough
3a07b785db disable auto insert of brackets and quotes in ace 2016-10-20 11:33:12 +01:00
James Allen
193766b437 Don't switch back to editor view when selecting a file in the history view 2016-10-19 10:43:53 +01:00
James Allen
c88624bf4c Pass through the data needed to trackChangesManager to determine if a remote was local or remote 2016-10-18 18:01:52 +01:00
James Allen
e717caab7f Merge branch 'master' into ja-review-panel 2016-10-18 16:52:41 +01:00
James Allen
05cd6e69a7 Add in extra sentry logging for undefined start in aceDelta 2016-10-18 16:37:40 +01:00
Brian Gough
29080bafb2 use PDFJS text layer renderer instead of our own 2016-10-14 12:00:47 +01:00
Brian Gough
c98f40b90b use a single pdfjs worker, rotated to avoid leaks 2016-10-13 16:10:02 +01:00
Brian Gough
85d8c2ed2e pass in PDFJS as a module, not global 2016-10-13 16:10:01 +01:00
Brian Gough
71275efebe remove unused pdf dependency 2016-10-13 16:10:01 +01:00
Brian Gough
27a8dc1dfd upgrade pdfjs to 1.6.210p1 2016-10-13 16:10:01 +01:00
Brian Gough
f31e3260ee remove pdfjs special case disableFontFace for MSIE 2016-10-13 16:10:01 +01:00
Brian Gough
4ca918a3b8 render canvas on-screen to avoid bad fonts in MSIE 2016-10-13 14:40:57 +01:00
James Allen
7a4bebd785 Allow review panel to be toggled 2016-10-13 14:22:23 +01:00
James Allen
42ab2e8165 Init review panel with ace editor height 2016-10-13 12:21:49 +01:00
James Allen
77c02042f8 Recalculate change offsets on editor resize 2016-10-13 12:09:18 +01:00
James Allen
8d968f6865 Tidy up ReviewPanelController 2016-10-13 10:09:59 +01:00
James Allen
fc782581ea Change review panel to feel like part of ace 2016-10-12 17:27:20 +01:00
James Allen
c689937297 Merge pull request #338 from sharelatex/ja-track-changes 
Ja track changes
 2016-10-12 09:21:46 +01:00
James Allen
4ac55c7671 Merge branch 'ja-track-changes' into ja-review-panel 2016-10-11 14:24:51 +01:00
Brian Gough
452f6117cd remove console.log 2016-10-11 13:56:17 +01:00
James Allen
65bc8a84db Merge pull request #332 from MCribbin/patch-4 
Update HumanReadableLogsRules.coffee
 2016-10-11 11:11:10 +01:00
James Allen
32d7bb16e5 Be more explicit with query string to turn on track changes 2016-10-11 09:40:15 +01:00
James Allen
9682af3981 Merge branch 'master' into ja-track-changes 
Conflicts:
	public/coffee/ide/history/HistoryManager.coffee
 2016-10-10 17:10:10 +01:00
James Allen
0995ba5ee6 Add basic change tracking into editor behind a feature flag 2016-10-10 17:06:46 +01:00
James Allen
1c9abd35f8 Rename track-changes -> history on the client 
Conflicts:
	app/views/project/editor/history.jade
 2016-10-10 16:59:25 +01:00
MCribbin
0d5e6e2abf Update HumanReadableLogsRules.coffee 2016-10-10 13:31:38 +01:00
James Allen
220759ee7a Merge pull request #330 from sharelatex/ja-non-english-spell-check 
Use comprehensive unicode letter regex for spell check matching
 2016-10-10 08:54:56 +01:00
Brian Gough
2d1a0b34d5 Merge pull request #333 from sharelatex/support-package-versions 
Support package versions
 2016-10-07 15:04:59 +01:00
MCribbin
fba22dc11f Update HumanReadableLogsRules.coffee 2016-10-06 12:29:42 +01:00
Brian Gough
9177544ed9 add left menu for syntax validator 2016-10-06 11:51:24 +01:00
Brian Gough
837151a395 include moment in package versions 2016-10-05 14:54:42 +01:00
MCribbin
1ce8901c2a Update HumanReadableLogsRules.coffee 2016-10-05 14:12:49 +01:00
James Allen
201012a131 Use comprehensive unicode letter regex for spell check matching 2016-10-04 11:24:48 +01:00
James Allen
1e1c4ec570 Disable font face in PDFs for IE 11 as well 2016-09-30 15:12:27 +01:00
Brian Gough
0eaa359f6c use syntax validator for beta programme users only 2016-09-23 15:19:40 +01:00
Brian Gough
d152095920 destroy ace sessions when no longer in use 
also set mode to "latex" when session is created, to avoid setting mode
to "text" (default) and then to "latex" which causes the text worker to
be unnecessarily created and destroyed.
 2016-09-23 15:19:40 +01:00