Commit graph

20319 commits

Author SHA1 Message Date
Henry Oswald
2443aa9e75 added check make back in and list of make grunt tasks 2016-09-21 12:08:11 +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
Henry Oswald
c41540fc02 remove helpers we don’t use 2016-09-20 17:08:38 +01:00
Henry Oswald
7d4286d368 add checkMongoConnect and checkRedisConnect funcs to grunt 2016-09-20 17:07:52 +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
89d1a9a51c Merge pull request #317 from sharelatex/ja-fix-doc-deletes
Ja fix doc deletes
2016-09-19 14:38:51 +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
a3abd2a4a5 Merge pull request #15 from sharelatex/ja-copy-paste-diff
Run a diff against big delete - insert changes which are likely copy-…
2016-09-19 11:07:51 +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
Winston Li
a8bad0539c Create/delete larger files in df test 2016-09-19 10:07:46 +01:00
Winston Li
fe058e8695 Use df equivalent as default for calculating used space 2016-09-19 10:01:07 +01:00
Winston Li
9a0f18e516 Increase postback timeout to 60s 2016-09-19 09:34:45 +01:00
James Allen
8dda44f880 Speed up unit tests by only generating big fixtures once up front 2016-09-16 11:51:41 +01:00
James Allen
dfe26262ec Return a No-op if diff returns nothing 2016-09-16 11:50:44 +01:00
James Allen
80375ae2dd Run a diff against big delete - insert changes which are likely copy-pastes 2016-09-16 11:33:36 +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
31ee019ecb Merge pull request #314 from sharelatex/ja-login-improvements
Ja login improvements
2016-09-13 11:43:15 +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
Brian Gough
373d9e02da Merge pull request #45 from sharelatex/fix-chktex-for-knitr
only run chktex on .tex files, not .Rtex files
2016-09-12 16:36:59 +01:00
Brian Gough
56429178df only run chktex on .tex files, not .Rtex files
the .tex files produced from knitr have macros which confuse chktex
2016-09-12 16:29:36 +01:00
Winston Li
184cdd7783 Merge pull request #17 from overleaf/swapstore
v0.5: Upgrade deps, huge refactor, swap store
2016-09-12 15:58:54 +01:00
Winston Li
e9ffcfe19e Remove extra comma 2016-09-12 15:42:18 +01:00
Winston Li
00d512725a Fix "evicated" typo 2016-09-12 15:16:20 +01:00
Winston Li
9b78138314 Remove duplicate call to create the last_accessed index 2016-09-12 15:13:55 +01:00
Winston Li
a8c743cb9c Schedule next swap job after previous job finishes 2016-09-12 15:11:56 +01:00
Winston Li
d6f3682df4 Update README about running tests 2016-09-12 14:27:00 +01:00
James Allen
5ce15c4d60 Move check of zero length op array up a level 2016-09-12 10:37:41 +01:00
James Allen
993aab7a78 Don't try to redis rpush with no arguments 2016-09-12 10:37:32 +01:00
James Allen
6ca48523d9 mapSeries -> eachSeries 2016-09-09 15:28:27 +01:00