Commit graph

2016 commits

Author SHA1 Message Date
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
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
0a350c8e3f infrastructure for using ace syntax checking 2016-09-23 15:19:40 +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
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
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
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
a93c939dbc Send invite email and notification in the background 2016-09-21 10:11: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
d4863ae148 don't use cdn for blog posts which have a http on them 2016-09-20 14:48:35 +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
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
Paulo Reis
afdded702b Use an object instead of a string, to avoid writing to another scope. 2016-09-06 14:59:18 +01:00
Brian Gough
ab2fe1de97 fix unclosed brace in template 2016-09-02 16:20:16 +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