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 |
|
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 |
|
Paulo Jorge Reis
|
1739842402
|
Merge pull request #310 from sharelatex/pr-fix-search-projects
Use an object instead of a string, to avoid writing to another scope.
|
2016-09-06 15:27:10 +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 |
|