Commit graph

3572 commits

Author SHA1 Message Date
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
Shane Kilkelly
0f65e98566 add acceptance test for clearing sessions 2016-10-10 10:55:45 +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
Henry Oswald
101896a754 redirect to /i/ university 2016-10-07 17:10:58 +01:00
Shane Kilkelly
25dd998107 clear-sessions page (+4 squashed commits)
Squashed commits:
[3a56af0] Remove cruft
[c5a1f6c] Finalise alignment
[82f741a] Working sessions page
[d40f069] WIP: display sessions
2016-10-07 16:47:00 +01:00
Brian Gough
d2db6663e5 Merge pull request #335 from sharelatex/bg-ace-syntax-validator
add ace syntax validator with latex parsing
2016-10-07 15:05:34 +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
Shane Kilkelly
894c549ec6 WIP: display sessions on a page 2016-10-06 15:49:47 +01:00
Brian Gough
fe866e54fc add latex syntax checking 2016-10-06 14:56:24 +01:00
Brian Gough
8c7d712738 update live version of ace to 1.2.5 2016-10-06 14:20:23 +01:00
Brian Gough
8ab0a396a1 added versioned directory for ace 1.2.5 2016-10-06 14:19:10 +01:00
Brian Gough
fc5f7b5df5 don't ignore files under js/ace directory in git 2016-10-06 14:19:10 +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
0946729ae6 clean up config object 2016-10-05 14:54:42 +01:00
Brian Gough
837151a395 include moment in package versions 2016-10-05 14:54:42 +01:00
Brian Gough
8b6425317f introduce PackageVersions module
put all package versions in one central place
2016-10-05 14:54:42 +01:00
MCribbin
1ce8901c2a Update HumanReadableLogsRules.coffee 2016-10-05 14:12:49 +01:00
Shane Kilkelly
95a66bbf00 Merge pull request #328 from sharelatex/sk-plain-text-email
Sk plain text email
2016-10-05 10:04:08 +01:00
Henry Oswald
3141f91b59 Merge pull request #322 from sharelatex/ho-password-limits
Ho password limits
2016-10-05 10:03:54 +01:00
Shane Kilkelly
73bb11e4a0 Ask user to type their email when deleting account, not "DELETE" 2016-10-04 15:57:08 +01:00
Paulo Reis
ef1aab1c27 Track header AB conversions only on click events. 2016-10-04 14:42:01 +01:00
Paulo Jorge Reis
38925feccd Merge pull request #331 from sharelatex/pr-ab-test-dropbox-teaser
AB test dropbox teaser
2016-10-04 14:35:05 +01:00
Paulo Reis
3925ba9364 Add assets for animated dropbox teaser. 2016-10-04 11:58:19 +01:00
Paulo Reis
ea8277ef78 Add assets for focused dropbox teaser. 2016-10-04 11:57:42 +01:00
James Allen
201012a131 Use comprehensive unicode letter regex for spell check matching 2016-10-04 11:24:48 +01:00
Shane Kilkelly
e699fcb1fa Add plain-text component to the project-invite email 2016-10-03 15:25:38 +01:00
Shane Kilkelly
b42a3b9188 Fix logging typo 2016-10-03 15:25:18 +01:00
Henry Oswald
ed906f085c fix spelling mistake in error message and comment out settings.defaults 2016-10-03 11:33:14 +01:00
James Allen
5188a138de Merge pull request #327 from sharelatex/ja-log-parser-improvements
Update log parser to better handle Runaway argument errors
2016-10-03 09:26:52 +01:00
James Allen
1e1c4ec570 Disable font face in PDFs for IE 11 as well 2016-09-30 15:12:27 +01:00
James Allen
901e32a050 Merge pull request #326 from sharelatex/ho-fingerprintmultiple
Ho fingerprintmultiple
2016-09-28 09:58:03 +01:00
Paulo Reis
cdd873a1cf Small style adjustments in the labels AB test. 2016-09-28 09:31:59 +01:00
Paulo Jorge Reis
cef367fde2 Merge pull request #325 from sharelatex/pr-ab-test-labels
AB test labels
2016-09-28 09:02:15 +01:00
Henry Oswald
4f3b57ceeb cleaned up comments 2016-09-27 16:23:40 +01:00
Henry Oswald
a00cb707cc fingerprints are grouped into lists with this change
fingerprints are shared when require.js pulls in other resources.
this change means changes to either ace.js or mode-latex.js will
result in different fingerprints for those files.
2016-09-27 16:21:04 +01:00
Paulo Reis
270bf81667 Cleanup. 2016-09-27 16:12:45 +01:00
Paulo Reis
b6d237e189 More granular tracking, in metabase. 2016-09-27 16:01:56 +01:00
Shane Kilkelly
b497182557 Add an acceptance test for registration and login 2016-09-27 11:55:51 +01:00
Paulo Reis
38d04e27c9 Restrict AB test to newly registered users. 2016-09-27 11:50:34 +01:00
Henry Oswald
6141eb4a44 null check user_id 2016-09-26 17:25:11 +01:00
Paulo Reis
6ccf7288e6 Register conversions. 2016-09-26 16:18:37 +01:00
Paulo Reis
d97313d22c Horizontal layout. 2016-09-26 16:09:27 +01:00
Paulo Reis
23671c7b18 Label styling. 2016-09-26 15:03:04 +01:00
Paulo Reis
9208fe7c30 Basic mark-up for AB testing labels. 2016-09-26 15:02:54 +01:00
Henry Oswald
8558ce1f75 improve error handling in update merger 2016-09-26 13:57:57 +01:00
Shane Kilkelly
fb6f6c13c9 Merge branch 'master' into sk-passport 2016-09-26 09:43:19 +01:00
Brian Gough
bba6008e4d Merge pull request #321 from sharelatex/ace-syntax-validator-minimal-change
Ace syntax validator minimal change
2016-09-26 09:25:50 +01:00
Shane Kilkelly
ab4916067e Merge branch 'master' into sk-passport 2016-09-26 09:18:24 +01:00
Shane Kilkelly
dd14e51713 Handle null, undefined and false in isUserLoggedIn 2016-09-23 16:53:07 +01:00
Henry Oswald
8a2b7d0461 server side protect passwords which are too long 2016-09-23 16:51:46 +01:00
Henry Oswald
0d0f0e8604 wip 2016-09-23 16:38:46 +01:00
Shane Kilkelly
f9030a0a38 get user_id directly 2016-09-23 16:25:23 +01:00
Shane Kilkelly
7384a08cb4 Pass req to function. 2016-09-23 16:21:07 +01:00
Henry Oswald
67f8ec756c Revert "wip"
This reverts commit a6c0b3e2bf9fd747cfce785a023e5f56614a8ca2.
2016-09-23 16:19:11 +01:00
Henry Oswald
7c0e338352 fix bug where users are always shown downgrade option when not required 2016-09-23 16:18:22 +01:00
Henry Oswald
5c2fbaafd3 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-09-23 15:45:42 +01:00
Henry Oswald
0802ab6ddc wip 2016-09-23 15:44:47 +01:00
Brian Gough
4f9826c87b show beta program link for everyone on /settings 2016-09-23 15:28:15 +01:00
Brian Gough
0eaa359f6c use syntax validator for beta programme users only 2016-09-23 15:19:40 +01:00
Brian Gough
975b70e4fe add latex syntax highlighting 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
Brian Gough
0a350c8e3f infrastructure for using ace syntax checking 2016-09-23 15:19:40 +01:00
Shane Kilkelly
02587377a2 Remove ReferalMiddleware, dead code. 2016-09-23 14:42:57 +01:00
Shane Kilkelly
6e8185aeaf Merge branch 'master' into sk-passport 2016-09-23 10:28:35 +01:00
Shane Kilkelly
6c716ca252 Fix acceptance tests by updating invite-accept url 2016-09-23 10:28:17 +01:00
Shane Kilkelly
72ca1d6316 Merge branch 'master' into sk-passport
# Conflicts:
#	app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
2016-09-23 10:01:11 +01:00
James Allen
2b317cab6c Merge pull request #320 from sharelatex/ja-validate-filenames
Don't allow files to be created with / or * characters
2016-09-23 09:42:48 +01:00
Paulo Jorge Reis
f4ff72a2e4 Merge pull request #318 from sharelatex/ja-invite-emails-once
Ja invite emails once
2016-09-22 17:36:10 +01:00
James Allen
e15976be21 Use token in URL to force its precense when invite and allow easy dynamic notifications 2016-09-22 17:24:06 +01:00
Shane Kilkelly
dbac4bd008 update session when user settings change 2016-09-22 16:58:25 +01:00
Shane Kilkelly
7e449c60ed fix tests 2016-09-22 16:04:42 +01:00
Shane Kilkelly
636b1fe9e2 Copy to session.user, for compatibility 2016-09-22 15:49:09 +01:00
Shane Kilkelly
a0f156e1a9 wipe out more session access 2016-09-22 15:33:50 +01:00
James Allen
21f88bb20e Use ide.validFileRegex, not hard coded regex 2016-09-22 14:57:59 +01:00
James Allen
9506797384 Update log parser to better handle Runaway argument errors 2016-09-22 14:47:48 +01:00
Shane Kilkelly
ff1c72ee14 Fix up more session access 2016-09-22 14:30:34 +01:00
Shane Kilkelly
c959e0c65d Set req.user 2016-09-22 13:54:13 +01:00
Shane Kilkelly
6df569253a Fix session touch 2016-09-22 13:48:09 +01:00
Shane Kilkelly
7f24dd6f55 Fix tests for UserInfoController. 2016-09-22 13:37:27 +01:00
Shane Kilkelly
a3ace1fccd Increase timeout because slow tests 2016-09-22 11:33:54 +01:00
Shane Kilkelly
3b73d97931 Use getLoggedInUserId 2016-09-22 11:33:38 +01:00
Shane Kilkelly
64c9a3ae18 Fix logic, was wrong way around 2016-09-22 11:16:50 +01:00
James Allen
4386ab1225 Don't allow files to be created with / or * characters
Requires the following translations:

  "files_cannot_include_invalid_characters": "Files cannot include '*' or '/' characters",
  "invalid_file_name": "Invalid File Name"
2016-09-21 16:31:55 +01:00
Shane Kilkelly
41cc9e68b5 update npm shrink-wrap 2016-09-21 15:15:44 +01:00
Brian Gough
de2e0478c6 disable pdfjs fontface on Microsoft Edge 2016-09-21 13:58:14 +01:00
Shane Kilkelly
c12450f533 Merge branch 'master' into sk-passport 2016-09-21 13:17:54 +01:00
Shane Kilkelly
dde5b7b830 Regenerate session on login, protect against session-fixation attack. 2016-09-21 13:03:37 +01:00
James Allen
d904e50041 Make project invite notification dynamic and accept via ajax request
Needs translations:

  "joining": "Joining",
  "notification_project_invite_message": "<b>{{ userName }}</b> would like you to join <b>{{ projectName }}</b>",
  "notification_project_invite_accepted_message": "You've joined <b>{{ projectName }}</b>",
  "open_project": "Open Project"
2016-09-21 11:59:35 +01:00
James Allen
779ace2fb7 Merge branch 'master' into ja-invite-emails-once 2016-09-21 10:48:43 +01:00
James Allen
2478a95bcb Don't watch files as grunt default 2016-09-21 10:48:23 +01:00
James Allen
bb7985208b Lower case email before considering if it's duplciated when sharing 2016-09-21 10:48:04 +01:00
James Allen
a93c939dbc Send invite email and notification in the background 2016-09-21 10:11:35 +01:00
Shane Kilkelly
bb71433727 Remove getLoggedInUser 2016-09-21 09:27:51 +01:00
Shane Kilkelly
eca1dfa482 Remove dead code 2016-09-21 09:27:35 +01:00
James Allen
c2e14ded13 Add null checks for fileRefs and docs, which are not present when calling mkdirp 2016-09-20 16:55:12 +01:00
Henry Oswald
1a67e4982e change blog regex to look for src's which start with a slash 2016-09-20 15:43:36 +01:00
Henry Oswald
21ca9697ca log user_id not user 2016-09-20 15:11:14 +01:00
Henry Oswald
777cbf1c80 move comment for user is false next to if statment 2016-09-20 14:51:51 +01:00
Henry Oswald
d4863ae148 don't use cdn for blog posts which have a http on them 2016-09-20 14:48:35 +01:00
Shane Kilkelly
4eada48638 Merge branch 'master' into sk-passport 2016-09-19 15:40:25 +01:00
James Allen
0917fe10ca Return type when finding element by path so that we don't need a heuristic 2016-09-19 14:35:25 +01:00
Brian Gough
ebe3ba4fb8 Merge pull request #316 from sharelatex/pdfjs-font-patch
Pdfjs font patch
2016-09-19 11:24:50 +01:00
Brian Gough
64dc1784d3 switch to patched version of pdfjs 2016-09-19 11:15:27 +01:00
Brian Gough
6f50d56ceb apply pdfjs font patch
https://github.com/mozilla/pdf.js/issues/2594#issuecomment-247644205
2016-09-19 10:30:34 +01:00
Brian Gough
dd4a509d51 add copy of unpatched pdfjs-1.3.91 2016-09-19 10:29:55 +01:00
Shane Kilkelly
97a6ac0f00 Merge branch 'master' into sk-passport
# Conflicts:
#	app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee
2016-09-15 14:48:51 +01:00
Shane Kilkelly
2119dcbb58 Finalise login workflow, works with login form again. 2016-09-15 14:36:11 +01:00
James Allen
06d67835e4 Don't redirect Google to nocdn=true, and remove canonical URL until we sort out translated domains 2016-09-15 10:21:12 +01:00
James Allen
c9a17982cf Add canonical url tag and don't include query string 2016-09-14 17:08:26 +01:00
James Allen
9019b20d50 Preserve line formatting in word count error message 2016-09-14 11:21:00 +01:00
James Allen
53b3e3831d Update cancellation survey link 2016-09-14 10:51:19 +01:00
James Allen
a45aa7b80e Show word count error messages 2016-09-13 15:54:25 +01:00
James Allen
cc9791d3f4 Redirect to login with a redirect back to the page we want if not logged in 2016-09-13 11:23:47 +01:00
James Allen
1714b014bf Force true or false for userHasNoSubscription, not blank 2016-09-13 10:29:14 +01:00
Shane Kilkelly
438ac45854 fix unit tests 2016-09-07 16:40:49 +01:00
Shane Kilkelly
8e0103a1bc wip: fix unit tests for AuthenticationController 2016-09-07 14:05:51 +01:00
Shane Kilkelly
cc5ddc92bb use getSessionUser rather than getLoggedInUser 2016-09-07 10:30:58 +01:00
Shane Kilkelly
9758dd77b3 kill whitespace 2016-09-07 08:58:57 +01:00
Shane Kilkelly
3a5b3a8e8d wip: acceptance tests working 2016-09-06 15:55:34 +01:00
Shane Kilkelly
b0a10c948c wip refactor 2016-09-06 15:22:13 +01:00
Paulo Reis
afdded702b Use an object instead of a string, to avoid writing to another scope. 2016-09-06 14:59:18 +01:00
Shane Kilkelly
749658a916 WIP: fixing acceptance tests 2016-09-06 13:21:22 +01:00
James Allen
e412e662ee Set default compileTimeout to 3 minutes for onsite users 2016-09-06 11:41:21 +01:00
Brian Gough
afa910c32d turn on syntax check for all users 2016-09-06 11:19:32 +01:00
Shane Kilkelly
c8ee803570 fix limits on sharing, account for both members and invites. 2016-09-06 09:37:53 +01:00
Shane Kilkelly
6aef092dce fix typo 2016-09-06 09:29:58 +01:00
Shane Kilkelly
eca4c46f7f WIP: refactor 2016-09-05 16:23:37 +01:00
Shane Kilkelly
ab2c1e82fb WIP: refactor 2016-09-05 15:58:31 +01:00
Shane Kilkelly
e6c7aa25ec barely functional login and logout 2016-09-05 10:28:47 +01:00
Shane Kilkelly
51e987b3b6 Merge branch 'master' into sk-passport 2016-09-02 16:29:07 +01:00
Brian Gough
ab2fe1de97 fix unclosed brace in template 2016-09-02 16:20:16 +01:00
Shane Kilkelly
e4f4325150 Basic passport integration 2016-09-02 16:17:37 +01:00
Henry Oswald
8002930270 don't use mathjax for cdn 2016-09-01 13:51:50 +01:00
Brian Gough
1592ca7623 Merge pull request #309 from sharelatex/fix-compile-check
clean up compile check
2016-08-31 16:27:36 +01:00
Brian Gough
e82411ac79 clear serverid on every compile check 2016-08-31 16:10:24 +01:00
Henry Oswald
bbb319f235 Merge pull request #307 from sharelatex/pr-empty-proj-list-dropdown
Empty project list dropdown
2016-08-31 15:47:30 +01:00
Brian Gough
b95a2c6d04 clean up compile check
use a valid user id, report all failures as errors, clear timeout on
success
2016-08-31 15:21:23 +01:00
Paulo Jorge Reis
70adae7a5b Merge pull request #308 from sharelatex/pr-hide-sign-up-plans-page
Hide "sign up" button in plans page, if user is logged in
2016-08-31 14:12:39 +01:00
Shane Kilkelly
1d83524853 Add a <code> block to autocomplete_references.
Use unescaped interpolation.
2016-08-31 13:54:51 +01:00
Shane Kilkelly
f849bf6d4c Add Autocomplete descriptions to hotkeys 2016-08-31 13:31:04 +01:00
Paulo Reis
bba39cc902 Also hide button, when viewing student plans. 2016-08-31 11:40:27 +01:00
Shane Kilkelly
47b1a5099a Better logging when plan is null. 2016-08-31 10:40:30 +01:00
Shane Kilkelly
f59d5d836d Check plan, return error if not valid.
This prevents a crash later when we refer to properties
of the plan object, which can end up being `null` when
the `planCode` is either missing, or not a valid code.
2016-08-31 10:18:53 +01:00
Shane Kilkelly
1b29e0e8ec Merge branch 'master' of github.com:sharelatex/web-sharelatex
# Conflicts:
#	app/coffee/Features/Notifications/NotificationsBuilder.coffee
2016-08-31 09:48:19 +01:00
Henry Oswald
960ed520b6 fix notifications builder @key bug 2016-08-31 09:42:43 +01:00
Shane Kilkelly
1399ee4689 Fix reference to @key in log expression. 2016-08-31 09:34:20 +01:00
Paulo Reis
09c188030c Hide sign up button via visibility, to keep the layout fixed. 2016-08-30 17:42:23 +01:00
Brian Gough
c44f33ce99 allow negative values for synctex positions 2016-08-30 16:45:21 +01:00
Paulo Reis
8c7b9edd21 Remove AB-related logic from template and controller. 2016-08-30 16:10:04 +01:00
Paulo Reis
e3fe4a2eeb Rename empty projects list file, do some clean-up. 2016-08-30 16:07:31 +01:00
Paulo Reis
2885164748 Isolate create project dropdown styles, to avoid influencing other dropdowns. 2016-08-30 15:32:23 +01:00
Shane Kilkelly
4a76fcd13b Change first param of getMemberSubscriptions to user_or_id, to match semantics of usage.
This function works whether a user object, or an ObjectId is passed, but the `user_id`
param name is confusing.
2016-08-30 14:26:57 +01:00
Henry Oswald
cbb4ee88cc Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-08-30 13:08:09 +01:00
Henry Oswald
ddc0023c64 make forceCreate the default for creating notifications 2016-08-30 13:07:37 +01:00
Henry Oswald
8c18153d5c Merge pull request #304 from sharelatex/ho-jade-speedup
Ho jade speedup
2016-08-30 12:47:08 +01:00
Brian Gough
16e4577ffa Merge pull request #306 from sharelatex/compile-check
Compile check
2016-08-30 11:58:04 +01:00
Brian Gough
7bf3b9daf9 add event tracking for syntax check 2016-08-26 15:54:01 +01:00
Brian Gough
74959e7947 add Grunt task to run without parallel watch 2016-08-26 15:21:18 +01:00
Brian Gough
3c59de31df finalise display of syntax check error message 2016-08-26 15:14:57 +01:00
Brian Gough
092d7da479 use Syntax error for consistency in file check 2016-08-25 16:56:06 +01:00
Brian Gough
696a7206c1 clean up display of error message 2016-08-25 16:55:29 +01:00
Brian Gough
588be16255 handle try/turn off options for syntax check 2016-08-25 15:52:37 +01:00
Brian Gough
9a1934465a clean up syntax check options on menu 2016-08-25 15:51:56 +01:00
Henry Oswald
26a4076c22 add redirect to /i/university for ab test 2016-08-25 10:48:29 +01:00
Brian Gough
7f20415048 only set compileExited on compile errors 2016-08-24 16:48:45 +01:00
Brian Gough
74bc157e7c added force recompile option 2016-08-24 16:48:37 +01:00
Henry Oswald
9238462fe4 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-08-24 16:34:47 +01:00
Henry Oswald
98770974df remove console.log 2016-08-24 16:34:33 +01:00
Paulo Reis
c82ab65077 Bind to an object to avoid writing in different . 2016-08-24 11:02:53 +01:00
Paulo Jorge Reis
f4aab93dfa Merge pull request #303 from sharelatex/pr-ab-subscription-form
PR AB Subscription form
2016-08-24 09:45:36 +01:00
Henry Oswald
3f4e888af5 Merge pull request #305 from sharelatex/cdnfallback
don't use cdn if it can not be accessed
2016-08-24 09:45:14 +01:00
Henry Oswald
934e908697 just use plain req.ip for logging 2016-08-23 17:00:13 +01:00
Henry Oswald
fcc7585444 put jquery as first script in head tag 2016-08-23 16:58:39 +01:00
Henry Oswald
6a72c2fce0 comment settings back out 2016-08-23 16:46:23 +01:00
Henry Oswald
f8799334ec Merge branch 'master' into ho-jade-speedup 2016-08-23 15:35:04 +01:00
Henry Oswald
114dbf9f3f Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-08-23 15:34:55 +01:00
Henry Oswald
d3ebdb64b2 precompile the jade partial views 2016-08-23 15:31:09 +01:00
Paulo Jorge Reis
68a085e1eb Merge pull request #302 from sharelatex/ja-billing-details-update
Redirect to working update billing details end point that shows a nic…
2016-08-23 14:42:58 +01:00
Paulo Reis
ba71ed2a3d Merge branch 'master' into pr-ab-subscription-form 2016-08-23 14:10:19 +01:00
Paulo Reis
8abf839d55 Add country to the paypal form. 2016-08-23 13:36:54 +01:00
Paulo Reis
bc16999a4e Validate on blur; reset validation on focus. 2016-08-23 11:55:23 +01:00
Brian Gough
4b50505ec9 suppress all cascading chktex environment errors 2016-08-23 11:27:27 +01:00
Paulo Reis
f79bee7893 Loading indicator when submitting. 2016-08-23 11:27:09 +01:00
Brian Gough
6f11c2d7cc Merge changes to HumanReadableLogsRules 2016-08-23 10:50:01 +01:00
Brian Gough
f26ed03e7d Merge pull request #299 from sharelatex/roll-out-chktex
Roll out chktex
2016-08-23 10:28:58 +01:00
Paulo Reis
1ac31f318e Restart validation on form changes. 2016-08-23 10:06:00 +01:00
Paulo Reis
362d75ef81 Log subscription errors. 2016-08-23 09:59:46 +01:00
James Allen
bcc8bfbe6c Redirect to working update billing details end point that shows a nice message 2016-08-22 17:36:33 +01:00
Paulo Reis
23ed1e2aa3 Add form validation. 2016-08-22 17:03:29 +01:00
MCribbin
290b1ad134 Update HumanReadableLogsRules.coffee
Added corrections to new hints:
-Double subscript
-Double superscript
-LaTeX Error: Something's wrong--perhaps a missing \item
-Misplaced \noalign
2016-08-22 16:33:07 +01:00
Paulo Reis
861022aff0 Make scrollbar only visible when needed. 2016-08-22 16:32:59 +01:00
Paulo Reis
2f93a102fd Fix layout to support scrollable messages. 2016-08-22 16:12:29 +01:00
Paulo Reis
a9095ccde8 Disable filter which wraps long words, still buggy. 2016-08-22 14:54:07 +01:00
Shane Kilkelly
11ec486c13 Merge pull request #300 from sharelatex/pr-subscription-improvements
Pr subscription improvements
2016-08-22 11:08:18 +01:00
Shane Kilkelly
03aa9b87f1 Add debug query string origin to invocations of the updateSubscription endpoint. 2016-08-22 10:09:54 +01:00
Henry Oswald
130fece0f6 track when users accept invites 2016-08-19 18:33:03 +01:00
Paulo Reis
b3db66e12b Place tracking event on controller load. 2016-08-19 17:10:07 +01:00
Paulo Reis
92bc411df5 Merge branch 'pr-ab-subscription-form' of github.com:sharelatex/web-sharelatex into pr-ab-subscription-form 2016-08-19 16:48:33 +01:00
Paulo Reis
f4b8cc7fc8 Use first and last name instead of full name as input. 2016-08-19 16:46:44 +01:00
Paulo Reis
53c6e48da9 Remove left-hand panel experiment. 2016-08-19 16:03:15 +01:00
Henry Oswald
110820face use url.resolve to build url for freegeoip lookups 2016-08-19 15:40:54 +01:00
Henry Oswald
50b3403983 use url.resolve to build url for freegeoip lookups 2016-08-19 15:39:58 +01:00
Paulo Reis
6a1f0de912 Add i18n keys. 2016-08-19 15:12:05 +01:00
Paulo Reis
452abe94be Add coupon code, VAT and pricing breakdown. Styling adjustments. 2016-08-19 14:51:07 +01:00
Shane Kilkelly
a904427531 Fix broken test 2016-08-19 11:57:44 +01:00
Henry Oswald
d8e7bacec4 added logging in 2016-08-19 11:53:40 +01:00
Shane Kilkelly
c02854c9d8 Improve log messages 2016-08-19 11:52:50 +01:00
Shane Kilkelly
07cd75cd64 Add an expect404 option to apiRequest.
Suppress error generation when 404 response is encountered.
2016-08-19 11:52:04 +01:00
Henry Oswald
3d36dc7d6c mvp for not using cdn when blocked 2016-08-19 11:05:35 +01:00
Paulo Reis
67290fd6a7 Fix formatting on change and paste events. 2016-08-18 17:56:53 +01:00
James Allen
c653f59705 Add error handling to mkdir_p 2016-08-18 17:48:33 +01:00
Paulo Reis
26e21732f8 Added validations + minor fixes. 2016-08-18 17:41:55 +01:00
Paulo Reis
82a6cd82a6 Minor tweaks in the features list. 2016-08-18 16:56:36 +01:00
Paulo Reis
43b832965f Layout and styling for simple subscription form. 2016-08-18 16:56:23 +01:00
Paulo Reis
097df3a771 Minor fixes. 2016-08-18 16:55:54 +01:00
Brian Gough
133250c150 extend log hints for more chktex errors 2016-08-18 13:28:47 +01:00
Brian Gough
109e79db99 track cascading errors in Human Readable Log Hints 2016-08-18 13:21:27 +01:00
Shane Kilkelly
4a6df04c21 Merge branch 'master' into pr-subscription-improvements 2016-08-18 12:53:56 +01:00
Paulo Reis
1af5017e49 Better integration with Angular models. 2016-08-18 10:39:55 +01:00
Brian Gough
090f10e3be add log hints for new chktex messages 2016-08-18 09:47:57 +01:00
Paulo Reis
4814fc2606 Simple layout for subscription form. 2016-08-17 17:34:17 +01:00
Paulo Reis
79d9e54458 Basic port of Stripe JS credit card validation and formatting lib. 2016-08-17 17:34:04 +01:00
Shane Kilkelly
ece0491e3d Refactor. Handle republishing of notifications on resend. 2016-08-17 16:27:15 +01:00
Paulo Reis
672d4f8767 Setup AB test (alternative is still empty). 2016-08-17 12:11:17 +01:00
Shane Kilkelly
85f49d6c9c Make whole 'red button' in email a link 2016-08-17 10:37:44 +01:00
Shane Kilkelly
c98e473bc3 Fix layout of notifications 2016-08-17 10:31:05 +01:00
Shane Kilkelly
4805c96584 Merge branch 'master' into pr-email-tokens 2016-08-17 08:52:24 +01:00
Shane Kilkelly
fc068b62a2 defend against undefined plan_code 2016-08-17 08:51:35 +01:00
Shane Kilkelly
81d0edf716 Improve error handling 2016-08-16 15:19:36 +01:00
Shane Kilkelly
ce78b855a3 Add counts to log message 2016-08-16 11:33:14 +01:00
Shane Kilkelly
da40f54d55 Improve logging, add acceptance tests for joinProject json 2016-08-16 11:17:45 +01:00
Brian Gough
cb4f6391a2 updated comments 2016-08-16 10:59:27 +01:00
Shane Kilkelly
b68af254ff Correct logic for bailing out with no privileges 2016-08-16 09:59:42 +01:00
Brian Gough
7fcae775ee Merge pull request #297 from sharelatex/roll-out-chktex
Roll out chktex
2016-08-16 09:48:01 +01:00
Shane Kilkelly
d2183738c5 Improve logging for debugging 2016-08-16 09:04:11 +01:00
Brian Gough
93f69ca0a2 run chktex silently for all users 2016-08-15 16:48:48 +01:00
Brian Gough
8d6cdb03e8 restrict compile check options
allowed options are validate/error/silent

validate = only run chktex, exit status 0
error = run compilation, exit(1) if chktex fails
silent = run chktex, but always do full compilation
2016-08-15 16:46:53 +01:00
Brian Gough
7bec656bc2 sort latex output files into order in dropdown 2016-08-15 16:45:33 +01:00
Shane Kilkelly
d40cf6568d Set invites to empty array 2016-08-15 15:40:16 +01:00
Shane Kilkelly
36d969e6e6 Set invites to be an empty array if missing 2016-08-15 15:22:23 +01:00
Shane Kilkelly
40cb7e4590 defend against undefined property 2016-08-15 15:19:16 +01:00
Shane Kilkelly
492853f284 Defend against undefined invites and members 2016-08-15 14:56:02 +01:00
Shane Kilkelly
158afbb157 Merge branch 'master' into pr-email-tokens
Conflicts:
	app/coffee/Features/Notifications/NotificationsBuilder.coffee
	public/coffee/ide/share/controllers/ShareController.coffee
2016-08-15 10:29:21 +01:00
Shane Kilkelly
f92767f7b5 Address feedback, add ? checks where appropriate 2016-08-12 15:26:20 +01:00
Shane Kilkelly
e53394919f Rework how invite expiry functions. 2016-08-12 14:40:59 +01:00
Shane Kilkelly
d547bff4e5 Blur the resend button after response 2016-08-12 11:25:03 +01:00