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
3974 commits 3 branches 7 tags 206 MiB
Commit graph

3918 commits

Author SHA1 Message Date
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
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
Paulo Reis
db5dc6ef15 Positive action buttons on the right. 2016-11-16 11:03:29 +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
Henry Oswald
5b3cd7ed2b use makeRequest func in analytics manager 2016-11-15 15:36:26 +00:00
Paulo Reis
7bf55823b2 Hide review panel when there are no entries. 2016-11-15 15:04:29 +00:00
Henry Oswald
a822cc0c92 don't log events from health check user 2016-11-15 13:41:15 +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
6776aa61f1 use new way to send status in express for healthcheck controlller 2016-11-15 11:04:13 +00:00
Henry Oswald
411b5324df don't try and send requests when analytics isn't enabled 2016-11-15 10:54:48 +00:00
Henry Oswald
d87067bc2f Merge branch 'announcments' 2016-11-15 10:38:01 +00:00
Henry Oswald
6ddfbe9125 Update settings.defaults.coffee 2016-11-15 10:36:11 +00:00
Henry Oswald
15564102a0 Update ProjectController.coffee 2016-11-15 10:34:57 +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
Shane Kilkelly
b212c00311 Fix acceptance tests, use the correct method of getting redis key. 2016-11-14 16:33:54 +00:00
Shane Kilkelly
b67a65ff6a Merge branch 'master' into sk-passport-saml 2016-11-14 16:11:24 +00:00
Shane Kilkelly
6c381b127c Count saml as an external authentication system. 2016-11-14 13:33:48 +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
Henry Oswald
e397b76fba commended out jade so can go live with rest of code quietly 2016-11-14 10:54:36 +00:00
Shane Kilkelly
803209e668 update shrinkwrap 2016-11-14 10:52:46 +00:00
Henry Oswald
47ed17aab3 remove unneeded package and comma in jade 2016-11-14 10:50:49 +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
666bfdf967 stop the /announcements call at controller level 2016-11-11 17:15:36 +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
Shane Kilkelly
2cf2199964 WIP: enable non-csrf routes from modules 2016-11-11 13:48:29 +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
Shane Kilkelly
8726a8fb4d Add passport-saml dependency 2016-11-11 09:09:00 +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
James Allen
593e59450b Use different UserSessions keys for cluster vs normal redis session store 2016-11-10 14:31:48 +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
4e2dd55cfd Fix merge issues 2016-11-10 10:53:30 +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
ca178c1a85 Fix indentation 2016-11-09 17:12:01 +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
Shane Kilkelly
c3860dd7a7 Remove stray commented-out code, use mapSeries instead of map. 2016-11-09 14:36:25 +00:00
James Allen
446ca7212a Track timestamps of changes 2016-11-09 12:19:48 +00:00
Shane Kilkelly
f6de4cbb44 Merge branch 'master' into sk-sessions-cluster 2016-11-09 12:10:46 +00:00
Shane Kilkelly
5f3098df38 Replace multi-ops with Async.series, tests passing 2016-11-09 11:03:03 +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
Shane Kilkelly
a373868862 Fix unit tests 2016-11-08 16:00:18 +00:00
Shane Kilkelly
bfa0e7cf89 WIP: start moving web sessions to cluster 2016-11-08 15:32:36 +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
Henry Oswald
d556cbaacf Merge pull request #361 from djwf/master 
Pass ignoreTLS option to nodemailer
 2016-11-08 11:26:42 +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
6f41dddb42 disable spell check for anonymous users 
these requests always fail
 2016-11-04 16:03:18 +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
Shane Kilkelly
8f0e56930c Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-11-04 10:05:54 +00:00
Shane Kilkelly
b16a533610 add npm-shrinkwrap.json 2016-11-04 10:04:12 +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
David J. Weller-Fahy
5efee51ed8 Pass ignoreTLS option to nodemailer 2016-11-02 13:14:54 -04:00
Paulo Reis
559350eaa2 Avoid showing the history upgrade teaser when user is not the project owner. 2016-11-02 16:08:47 +00:00
Shane Kilkelly
e7b09a81a7 Merge branch 'sk-passport-ldap' 2016-11-02 15:39:32 +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
fde9ab60cc remove left-menu-upgraed-rotation ab test 2016-11-02 10:24:03 +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
c5e793125e Update unit tests. 2016-11-01 16:55:26 +00:00
Paulo Reis
840d52ef1a Remove default value from user model, but add it upon creation (i.e. affecting new users). 2016-11-01 16:36:26 +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
8c182c2ccd Show code-check option for non-beta users. 2016-11-01 15:26:26 +00:00
Brian Gough
585f8681ea enable syntax validation for all users 
(by defining aceWorker)
 2016-11-01 15:02:32 +00:00
Paulo Reis
4c94c027b8 Styles for better accomodating smaller resolutions. Vertically centering. 2016-11-01 14:52:10 +00:00
Shane Kilkelly
9cb3d8c4b8 Enable hook from module into passport init. 2016-11-01 14:06:54 +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
fda66107a9 Turn teaser visibility logic on. 2016-11-01 11:46:47 +00:00
Paulo Reis
06629e05d4 Include teaser media and do some style adjustments. 2016-11-01 11:36:21 +00:00
Paulo Reis
2c78b5967f Fix settings logic. 2016-11-01 11:36:05 +00:00
Paulo Reis
9418d9ea6a Add code checker teaser media. 2016-11-01 11:35:46 +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
Paulo Reis
31697bd1e2 Add lightbox shadows. 2016-10-31 20:17:58 +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
Paulo Reis
4721fd450c Improve condition to avoid linking sixpack directives when project loads. 2016-10-28 14:40:04 +01:00
Paulo Reis
8157f68393 Avoid linking sixpack directives when project loads. 2016-10-28 14:23:16 +01:00
Shane Kilkelly
5c8cdd22cc Merge branch 'sk-account-delete-pass' 2016-10-28 11:02:41 +01:00
Shane Kilkelly
6e6211bde6 Merge branch 'sk-plain-text-emails-all' 2016-10-28 11:02:33 +01:00
Shane Kilkelly
4c092e7ff1 Remove deprecated "projectSharedWithYou" email. 2016-10-28 10:37:10 +01:00
Shane Kilkelly
164c8a091f Move the scripts block after jQuery has been loaded and CDN logic. 
Fixes issue on the update-billing-info page.
 2016-10-28 10:18:20 +01:00
Paulo Jorge Reis
a274e0e175 Merge pull request #353 from sharelatex/pr-ab-test-history-teaser 
AB test history teaser
 2016-10-28 09:08:26 +01:00
Brian Gough
8887ab78c0 improve ace mode recognition 2016-10-27 15:42:19 +01:00
Shane Kilkelly
751a116921 add plainTextTemplate to all emails 2016-10-27 14:41:13 +01:00
Paulo Reis
1c4183e7b1 Merge branch 'master' into pr-ab-test-history-teaser 2016-10-27 12:35:11 +01:00
Paulo Reis
ad33aa1bb8 Move Metabase tracking code. 2016-10-27 12:22:58 +01:00
Paulo Reis
5dddbec5b2 Add AB test conversion. 2016-10-27 12:06:36 +01:00
Paulo Reis
991626692b Track subscriptions in metabase with AB test variant. 2016-10-27 12:05:32 +01:00
Paulo Reis
5a82cebcff Make the history teaser message look like a modal. 2016-10-27 11:12:22 +01:00
Shane Kilkelly
2029ec2535 Merge branch 'sk-plans-tidy' 2016-10-27 10:42:29 +01:00
Paulo Reis
04f8b3adfa Adapt mark-up to history teaser, add some styles. 2016-10-27 10:30:10 +01:00
Paulo Reis
702f0aa39b Generalize teaser style. 2016-10-27 10:29:38 +01:00
Paulo Reis
9f4299b69a Add history teaser image. 2016-10-27 10:29:04 +01:00
Shane Kilkelly
f396f5b09e update prices in front-end 2016-10-27 09:57:46 +01:00
Shane Kilkelly
1538f140f3 update test timestamp 2016-10-27 09:41:51 +01:00
Paulo Reis
b5494c1730 Basic test mark-up structure. 2016-10-26 15:48:03 +01:00
Brian Gough
eab7d46fc5 update latex syntax validator (e4b016e) 2016-10-26 15:15:18 +01:00
Brian Gough
cb4380fa78 fix problem with setting syntax validation option 2016-10-26 15:08:29 +01:00
Shane Kilkelly
dfd13e0815 Update AB test timestamp 2016-10-26 14:24:00 +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
Shane Kilkelly
dc62b1a86e Remove deprecated endpoint for old delete-user 2016-10-26 11:18:36 +01:00
Paulo Reis
70c7880639 Style adjustments. 2016-10-26 11:12:34 +01:00
Shane Kilkelly
a4167fcccd Unit tests for tryDeleteUser 2016-10-26 11:01:35 +01:00
Shane Kilkelly
7cc26f2207 Disable autocomplete on user-delete form 2016-10-26 10:57:54 +01:00
Shane Kilkelly
fc7bd4c2d3 fix logging 2016-10-26 10:57: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
Shane Kilkelly
1c8721ceab Functioning account deletion with password 2016-10-25 16:23:50 +01:00
Brian Gough
baf09e4f3a avoid exception in LoggerSerializers 2016-10-25 15:50:05 +01:00
Brian Gough
bb06b97b3c avoid exception in logging null user 2016-10-25 15:01:59 +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
Shane Kilkelly
efe6df145c WIP: ask for password when deleting account 2016-10-25 14:33:47 +01:00
Paulo Jorge Reis
92c4c3db69 Merge pull request #350 from sharelatex/pr-fix-overflow-proj-name 
Prevent overflowing project names.
 2016-10-25 14:31:33 +01:00
Brian Gough
3519fbe337 add worker-latex.js to fingerprints 2016-10-25 14:18:37 +01:00
Brian Gough
a02d245b78 added missing dependency on ace/ace for modelist 2016-10-25 14:16:52 +01:00
James Allen
43aeb5a21d Clear SERVERID cookie when reconnecting gracefully 2016-10-25 14:09:36 +01:00
Brian Gough
7d2b453030 update ace latex syntax checking (d18cb91) 2016-10-25 13:58:37 +01:00
Brian Gough
d6333d2955 Merge pull request #346 from sharelatex/bg-use-ace-mode-detection 
use ace mode detection
 2016-10-25 13:54:05 +01:00
Shane Kilkelly
6069d4dba3 Merge branch 'master' into sk-plans-tidy 2016-10-25 13:14:44 +01:00
Shane Kilkelly
ae2d030a32 Don't call participate if should not test plans 2016-10-25 11:46:52 +01:00
Shane Kilkelly
e268275e77 Fix participate/convert flow for plan tests 2016-10-25 10:47:14 +01:00
Shane Kilkelly
c091399610 Remove track-changes-discount experiment 2016-10-25 09:47:22 +01:00
Henry Oswald
1c3edcd627 added some debug lines 2016-10-24 23:36:49 +01:00
Paulo Reis
4e62e5c4c5 Prevent overflowing project names. 2016-10-24 17:08:46 +01:00
James Allen
52754e038a Reconnect gracefully when asked to by real-time 2016-10-24 16:36:40 +01:00
Paulo Reis
27dfa91683 Add dismiss button. 2016-10-24 12:20:15 +01:00
Paulo Reis
32d59b6212 Add setting saving logic. 2016-10-24 12:20:08 +01:00
Shane Kilkelly
667c7ce520 Show correct number of collaborators for plans 2016-10-24 11:47:01 +01:00
Shane Kilkelly
c051b56abf Cloak plans until they have loaded 2016-10-24 11:24:28 +01:00
Shane Kilkelly
5cf82e4ef7 Add Metabase events 2016-10-24 11:08:19 +01:00
Shane Kilkelly
8dfd487941 Add plan to event tracking 2016-10-24 11:00:09 +01:00
James Allen
49fecc9ef4 Use v1.6.0 of metrics 2016-10-24 10:51:20 +01:00
Shane Kilkelly
c1ebc65a3b Move convert to top 2016-10-24 10:41:32 +01:00
Henry Oswald
8ba3884428 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-10-21 19:20:43 +01:00
Henry Oswald
91e9447fe5 added logging to smoke test 2016-10-21 19:20:21 +01:00
Henry Oswald
450946212a log out health check failures 2016-10-21 18:59:28 +01:00
Shane Kilkelly
8c1d110688 Remove debug logs 2016-10-21 16:21:21 +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
9dd06df839 More style adjustments. 2016-10-21 15:00:26 +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
Brian Gough
4d551ced5e add pdfjs cmaps 2016-10-20 12:53:34 +01:00
Paulo Reis
e60f67dacb Bootstrapping. 2016-10-20 12:24:07 +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
Henry Oswald
1beca53b3d project name should be clickable href in invite email 2016-10-18 15:53:56 +01:00
Brian Gough
cf09a9ed83 Merge pull request #344 from sharelatex/bg-upgrade-pdfjs 
upgrade pdfjs
 2016-10-14 17:03:13 +01:00
Henry Oswald
a02da61cb0 fixed email sender tests looking for wrong settings 2016-10-14 16:43:59 +01:00
Brian Gough
29080bafb2 use PDFJS text layer renderer instead of our own 2016-10-14 12:00:47 +01:00
Brian Gough
e42d256d4f remove pdfjs-1.0.712 no longer used 2016-10-13 16:10:02 +01:00
Brian Gough
1bbf237943 remove pdfjs-1.0.1040 no longer used 2016-10-13 16:10:02 +01:00
Brian Gough
991486ab60 make html valid (div not allowed in p tag) 2016-10-13 16:10:02 +01:00
Brian Gough
0bd36a9e3b fix comment 2016-10-13 16:10:02 +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
5748d1e7ec add pdfjs 1.6.210 (patched with font fix) 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
09195882f4 Add scrollbar todo note 2016-10-13 14:25:46 +01:00
James Allen
4999ed30f8 Merge branch 'master' into ja-review-panel 2016-10-13 14:22:43 +01:00
James Allen
7a4bebd785 Allow review panel to be toggled 2016-10-13 14:22:23 +01:00
Henry Oswald
bfeb7e082f added textEncoding option for email 2016-10-13 14:22:08 +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
Henry Oswald
d0f9a07197 turn subscriptions off by default 2016-10-12 17:35:40 +01:00
James Allen
fc782581ea Change review panel to feel like part of ace 2016-10-12 17:27:20 +01:00
Shane Kilkelly
3ec0e65ae1 Merge branch 'master' into sk-end-subform-test 2016-10-12 14:34:55 +01:00
James Allen
bf0fba2c89 Minify correct version of Ace 2016-10-12 09:52:15 +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
436d63fa12 Merge pull request #339 from sharelatex/ja-fix-accent-keys 
Patch Ace to fix accent key problem in Chrome
 2016-10-12 09:21:33 +01:00
Shane Kilkelly
e706057677 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-10-11 14:44:09 +01:00
Brian Gough
ed262409de Merge pull request #342 from sharelatex/bg-provide-default-requirejs-config 
use separate jade template block for requirejs
 2016-10-11 14:42:40 +01:00
Shane Kilkelly
8fcc58495e Use a new key for the delete-account warning 2016-10-11 14:34:30 +01:00
Brian Gough
380487abf0 use separate jade template block for requirejs 
removes the need to suppressDefaultJs
 2016-10-11 14:31:04 +01:00
James Allen
4ac55c7671 Merge branch 'ja-track-changes' into ja-review-panel 2016-10-11 14:24:51 +01:00
James Allen
e9c8fc7c20 Add in review panel layout 2016-10-11 14:24:01 +01:00
Shane Kilkelly
e2cf40ff33 Remove old default subscription form, replace with 'simple' form 2016-10-11 14:07:31 +01:00
Brian Gough
452f6117cd remove console.log 2016-10-11 13:56:17 +01:00
Brian Gough
0f2959eb3b use suppressDefaultJs instead of suppressFooter 2016-10-11 13:04:10 +01:00
Brian Gough
b9ecfcf41f provide minimal requirejs config 2016-10-11 13:02:30 +01:00
James Allen
0fbbad33ff Use built in Ace browser detection 2016-10-11 11:40:26 +01:00
Paulo Reis
e26eda5754 Update regex to grab Chrome version. 2016-10-11 11:34:33 +01:00
James Allen
0b6c71f688 Patch Ace to fix accent key problem in Chrome 2016-10-11 11:17:38 +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
cd33029678 Merge pull request #337 from MCribbin/patch-5 
Update HumanReadableLogsRules.coffee
 2016-10-11 11:10:44 +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
Henry Oswald
65e48652ee don't add second slash into uni redirect 2016-10-10 15:36:12 +01:00
Henry Oswald
adc6b429e6 record when a subscription is canceled 2016-10-10 15:29:54 +01:00
Henry Oswald
92e3101d81 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-10-10 15:29:06 +01:00
Shane Kilkelly
c4fd9f3bce Merge branch 'master' into sk-session-button 2016-10-10 14:49:55 +01:00
MCribbin
0d5e6e2abf Update HumanReadableLogsRules.coffee 2016-10-10 13:31:38 +01:00
Shane Kilkelly
9d3baf488f Use the query operator for existence check 2016-10-10 13:28:03 +01:00
Shane Kilkelly
a722646040 Remove un-used module 2016-10-10 11:05:14 +01:00