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
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