James Allen
638359e052
Don't delete knitr cache files
2016-09-22 14:14:29 +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
Henry Oswald
1fca396be2
fix comments for user create
2016-09-22 12:45:45 +01:00
Henry Oswald
1c3be11b8c
Update docker-compose.yml
2016-09-22 12:32:25 +01:00
Henry Oswald
5e1f7d86fd
make errors more clear
2016-09-22 12:30:43 +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
James Allen
cce93b95a5
Fetch updates before doc content when building a diff
2016-09-22 11:19:05 +01:00
James Allen
05a048db9a
Add in a little more logging
2016-09-22 11:19:05 +01:00
Shane Kilkelly
64c9a3ae18
Fix logic, was wrong way around
2016-09-22 11:16:50 +01:00
ShareLaTeX
22a3225e70
added check db init script
2016-09-21 17:10:27 +00:00
ShareLaTeX
046faae590
added contacts runit
2016-09-21 17:09:53 +00:00
ShareLaTeX
ea7f7af88d
added notificaitons service
2016-09-21 17:09:23 +00:00
Henry Oswald
b32cdab053
spell check notifications
2016-09-21 17:54:46 +01:00
Henry Oswald
e98a23759c
install texcount on default image
2016-09-21 16:59:37 +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
Henry Oswald
e0d548a284
Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image
2016-09-21 15:24:32 +01:00
Henry Oswald
cb90144ae5
moved run.sh to run
2016-09-21 15:24:07 +01:00
Brian Gough
fe1caa806a
Merge pull request #319 from sharelatex/fix-pdf-renderer-for-edge
...
disable pdfjs fontface on Microsoft Edge
2016-09-21 15:20:56 +01:00
Shane Kilkelly
41cc9e68b5
update npm shrink-wrap
2016-09-21 15:15:44 +01:00
James Allen
4c04a5df3f
Sanitize resource path along with rootResourcePath
2016-09-21 15:09:01 +01:00
Brian Gough
de2e0478c6
disable pdfjs fontface on Microsoft Edge
2016-09-21 13:58:14 +01:00
ShareLaTeX
66dcbb9b96
move settings file to early on
2016-09-21 12:47:07 +00: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
Henry Oswald
1e81ab7bef
throw errors in grunt when checking
2016-09-21 12:43:58 +01:00
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