Commit graph

2455 commits

Author SHA1 Message Date
James Allen
293ba1fc4c Fetch all ranges from docstore when viewing overview panel 2016-12-09 15:43:08 +00:00
James Allen
1d426e538f Load ranges from docupdater and toggle track changes when possible 2016-12-08 14:10:30 +00:00
James Allen
1830d41eba Proxy ranges between doc updater and docstore 2016-12-08 14:09:06 +00:00
Paulo Reis
42bd1852c6 Use HTML binding in the excerpt. 2016-12-07 15:45:22 +00:00
Paulo Reis
58ab888f3f Add a button to show all, when filtering new items. 2016-12-07 14:57:54 +00:00
Paulo Reis
c716b86def Add logic to dismiss unread announcements, styling fixes. 2016-12-07 14:26:10 +00:00
Henry Oswald
e6eeb86046 add read property to announcments 2016-12-07 11:39:22 +00:00
Paulo Reis
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
6a9ab1f525 Style adjusments; make announcements close when backdrop is clicked. 2016-12-06 14:17:30 +00:00
Shane Kilkelly
a5d2183441 if Recurly error, parse body xml rather than using regex match 2016-12-06 10:39:59 +00:00
Shane Kilkelly
58280bf6ee Merge branch 'master' into sk-user-delete-with-cancelled-sub 2016-12-06 09:31:42 +00:00
Paulo Reis
a00acd7458 Add animations and state toggling. 2016-12-05 15:32:38 +00:00
James Allen
48cc5a992f Merge branch 'master' into ja-set-version-in-docstore 2016-12-01 09:30:53 +00:00
Shane Kilkelly
e03d16e0cd Deleting user: if subscription is already cancelled, ignore and proceed. 2016-11-30 16:03:18 +00:00
James Allen
34276520d8 Merge pull request #379 from sharelatex/sk-show-user-email
Add a `user_email` option to the nav "Account" dropdown.
2016-11-30 15:49:34 +00:00
Shane Kilkelly
d38890e9f4 Add the rolling option to session 2016-11-30 09:41:58 +00:00
James Allen
eb648b9bc8 Proxy version number to and from docstore 2016-11-29 17:16:56 +00:00
Paulo Reis
73e0a63689 Basic mark-up and styles. Change the controller to hold all notifications. 2016-11-29 17:12:53 +00:00
Shane Kilkelly
cf94429e05 Add a user_email option to the nav "Account" dropdown. 2016-11-29 16:04:20 +00:00
Henry Oswald
68ddf04fe8 to string record event check 2016-11-29 14:38:45 +00:00
Henry Oswald
6e9458e9e1 wip 2016-11-29 14:38:25 +00:00
Henry Oswald
aacdb1e96b to string record event check 2016-11-28 19:19:00 +00:00
Shane Kilkelly
a03ac8fe72 More robust session destruction after deleting user account. 2016-11-28 12:37:53 +00:00
Shane Kilkelly
d15659ed85 check user is present before accessing email 2016-11-28 12:01:11 +00:00
Shane Kilkelly
52462d7020 Merge branch 'sk-sync-details-from-sso' 2016-11-28 10:11:59 +00:00
Shane Kilkelly
395135a655 Merge branch 'sk-post-login-redirect' 2016-11-28 09:52:14 +00:00
Shane Kilkelly
acce8853ba Remove redundant baseUrl from plans page. 2016-11-25 15:24:50 +00:00
Shane Kilkelly
2ab5ad4230 If we're updating details from a SSO source, don't allow editing on settings page. 2016-11-25 14:38:00 +00:00
Henry Oswald
4b59fdd453 added missing settings file to announcments controller 2016-11-25 11:59:50 +00:00
Henry Oswald
f130470971 log ip address of user when logging in 2016-11-25 11:59:50 +00:00
Paulo Reis
ecd81738cb Restyle toggle. 2016-11-24 15:55:09 +00:00
Shane Kilkelly
167f01857a Remove stray next params. 2016-11-24 14:15:01 +00:00
Shane Kilkelly
4cc4a4e264 Merge branch 'master' into sk-post-login-redirect 2016-11-24 14:02:38 +00:00
Shane Kilkelly
22101d0305 If user is sent to login page with explicit redirect, obey 2016-11-24 11:38:13 +00:00
Paulo Reis
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
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
Shane Kilkelly
8089bb55a4 use session for the post-login redirect, remove redir query string. 2016-11-22 14:24:36 +00:00
Paulo Reis
dce272462a Remove test-related mark-up. 2016-11-22 10:39:56 +00:00
James Allen
db93bc8cff Grey out and add extra info to resolved comments 2016-11-21 17:13:17 +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
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
6ea61472ec Add tooltip to add comment indicator 2016-11-18 16:08:02 +00:00
Paulo Reis
f029c7a7b2 Control click behaviour on comments; relayout when toggling panels. 2016-11-18 15:08:16 +00:00
Shane Kilkelly
da1be67aff Merge branch 'sk-ext-auth-show-email' 2016-11-18 09:34:05 +00:00
James Allen
bf20799478 Allow comments to be resolved an deleted 2016-11-17 18:06:08 +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
Shane Kilkelly
6606375cd7 Remove dead code: SessionInvalidator 2016-11-17 15:27:58 +00:00
Shane Kilkelly
fa146a1558 Remove redundant !! 2016-11-17 14:48:15 +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
James Allen
e2f21a67d2 Sort of positioning and scrolling of overview panel 2016-11-17 12:09:07 +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
f170fd4b83 Refactor Ace directive to have a single events bridge. 2016-11-17 10:40:08 +00:00
Paulo Reis
706b0793ab Pull callouts into entries directives. 2016-11-16 16:21:24 +00:00
Paulo Reis
32b3ba6bbb Pull indicators into entries directives. 2016-11-16 16:13:39 +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
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
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
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
829ccb6641 Resize on toggling review panel 2016-11-15 16:21:45 +00:00
Paulo Reis
8a11c8c3ca Show add comment button when review panel is off. 2016-11-15 16:02:12 +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
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
15564102a0 Update ProjectController.coffee 2016-11-15 10:34:57 +00:00
Paulo Reis
0c600ba9b8 Support overflowing panes in UI layout. 2016-11-15 10:34:19 +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
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
Henry Oswald
47ed17aab3 remove unneeded package and comma in jade 2016-11-14 10:50:49 +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
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
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
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
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
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
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
064ae1945a Toggle review panel and track changes with ui elements 2016-11-08 16:43:01 +00:00
Shane Kilkelly
bfa0e7cf89 WIP: start moving web sessions to cluster 2016-11-08 15:32:36 +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
Brian Gough
6f41dddb42 disable spell check for anonymous users
these requests always fail
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
49a06f8489 modal for lost connection 2016-11-03 12:37:44 +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 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
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
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
Shane Kilkelly
9cb3d8c4b8 Enable hook from module into passport init. 2016-11-01 14:06:54 +00:00
Paulo Reis
06629e05d4 Include teaser media and do some style adjustments. 2016-11-01 11:36:21 +00:00
Paulo Reis
aa58b70d43 Improve visibility logic. 2016-10-31 20:18:08 +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
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
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
Paulo Reis
04f8b3adfa Adapt mark-up to history teaser, add some styles. 2016-10-27 10:30:10 +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
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
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
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
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
f4849201aa Merge branch 'master' into pr-latex-linter-onboarding 2016-10-25 15:00:26 +01:00
Shane Kilkelly
efe6df145c WIP: ask for password when deleting account 2016-10-25 14:33:47 +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
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
e268275e77 Fix participate/convert flow for plan tests 2016-10-25 10:47:14 +01:00
Paulo Reis
27dfa91683 Add dismiss button. 2016-10-24 12:20:15 +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
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
777b28b443 Add animation and other styling items. Small refactor with Less vars. 2016-10-21 12:02:53 +01:00
Paulo Reis
ac07ba035b Navigation in onboarding UI. 2016-10-20 16:39:43 +01:00
Brian Gough
7258e947a8 use ace modelist extension to auto-detect mode 2016-10-20 16:03:19 +01:00
James Allen
8f9a4882c8 Don't let widgets in review panel overlap 2016-10-20 15:04:10 +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
e717caab7f Merge branch 'master' into ja-review-panel 2016-10-18 16:52:41 +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
991486ab60 make html valid (div not allowed in p tag) 2016-10-13 16:10:02 +01:00