github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
3338 commits 3 branches 7 tags 206 MiB
Commit graph

3338 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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