Shane Kilkelly
acce8853ba
Remove redundant baseUrl
from plans page.
2016-11-25 15:24:50 +00:00
Shane Kilkelly
167f01857a
Remove stray next
params.
2016-11-24 14:15:01 +00:00
Shane Kilkelly
4cc4a4e264
Merge branch 'master' into sk-post-login-redirect
2016-11-24 14:02:38 +00:00
Shane Kilkelly
22101d0305
If user is sent to login page with explicit redirect, obey
2016-11-24 11:38:13 +00:00
Paulo Jorge Reis
ff0a5395e5
Merge pull request #374 from sharelatex/pr-wrap-ab-test-header
...
PR Wrap header labels AB test
2016-11-23 09:49:53 +00:00
Shane Kilkelly
cee3326ce3
fix omission of 'length'
2016-11-22 17:06:05 +00:00
Shane Kilkelly
f9b1862ddb
Merge branch 'master' into sk-post-login-redirect
2016-11-22 16:54:12 +00:00
Shane Kilkelly
8a4352fff2
Set redirect when redirecting from restricted
2016-11-22 16:54:03 +00:00
Shane Kilkelly
2edd75de96
Allow the 500/Error page to render, even if res.locals aren't set up yet.
2016-11-22 16:48:13 +00:00
Shane Kilkelly
8089bb55a4
use session for the post-login redirect, remove redir
query string.
2016-11-22 14:24:36 +00:00
Paulo Reis
0bc52412ea
Hide header labels in XS resolutions (i.e. up to 768px).
2016-11-22 10:59:20 +00:00
Paulo Reis
fab7ec3e98
Remove test-related tracking and analytics code.
2016-11-22 10:50:29 +00:00
Paulo Reis
dce272462a
Remove test-related mark-up.
2016-11-22 10:39:56 +00:00
Brian Gough
889d8f51c4
make Document _onError handler more robust
...
replace console.error with sl_console.log to prevent browser crashing
before exiting document if console object does not exist.
2016-11-21 13:58:08 +00:00
Shane Kilkelly
da1be67aff
Merge branch 'sk-ext-auth-show-email'
2016-11-18 09:34:05 +00:00
Shane Kilkelly
6606375cd7
Remove dead code: SessionInvalidator
2016-11-17 15:27:58 +00:00
Shane Kilkelly
fa146a1558
Remove redundant !!
2016-11-17 14:48:15 +00:00
Shane Kilkelly
9bd7c2d827
Merge branch 'master' into sk-ext-auth-show-email
2016-11-17 14:35:02 +00:00
Shane Kilkelly
3b8fbe8249
If using external auth, show non-editable email field.
...
Also defend server-side against setting email when using external auth.
2016-11-17 14:34:02 +00:00
Brian Gough
a2a760afce
add missing pdfjs charmaps
2016-11-17 14:17:56 +00:00
Brian Gough
50042ee97e
fix latex code check for minted
...
include minted in list of verbatim enviroment
2016-11-16 14:50:09 +00:00
Brian Gough
277894631a
try out new pdfjs font fix
...
https://github.com/mozilla/pdf.js/pull/7705
2016-11-16 14:50:09 +00:00
Shane Kilkelly
f9774141b1
Fix up makeRequest, so it copes with analytics.url
being un-configured.
2016-11-16 14:40:38 +00:00
Henry Oswald
5b3cd7ed2b
use makeRequest func in analytics manager
2016-11-15 15:36:26 +00:00
Henry Oswald
a822cc0c92
don't log events from health check user
2016-11-15 13:41:15 +00:00
Henry Oswald
b9001f19e6
use indexOf not matches for searching for project by name
...
matches treats string like regex so chars like ( break it
just doing a simple indexOf == -1 is fine for a string match
will also fix it for projects with . in name which do come up
2016-11-15 11:41:14 +00:00
Henry Oswald
6776aa61f1
use new way to send status in express for healthcheck controlller
2016-11-15 11:04:13 +00:00
Henry Oswald
411b5324df
don't try and send requests when analytics isn't enabled
2016-11-15 10:54:48 +00:00
Henry Oswald
d87067bc2f
Merge branch 'announcments'
2016-11-15 10:38:01 +00:00
Henry Oswald
6ddfbe9125
Update settings.defaults.coffee
2016-11-15 10:36:11 +00:00
Henry Oswald
15564102a0
Update ProjectController.coffee
2016-11-15 10:34:57 +00:00
Shane Kilkelly
b212c00311
Fix acceptance tests, use the correct method of getting redis key.
2016-11-14 16:33:54 +00:00
Shane Kilkelly
b67a65ff6a
Merge branch 'master' into sk-passport-saml
2016-11-14 16:11:24 +00:00
Shane Kilkelly
6c381b127c
Count saml as an external authentication system.
2016-11-14 13:33:48 +00:00
Henry Oswald
e397b76fba
commended out jade so can go live with rest of code quietly
2016-11-14 10:54:36 +00:00
Shane Kilkelly
803209e668
update shrinkwrap
2016-11-14 10:52:46 +00:00
Henry Oswald
47ed17aab3
remove unneeded package and comma in jade
2016-11-14 10:50:49 +00:00
James Allen
d32a7d0a94
Only apply doc changes, not fold changes in undo manager
2016-11-14 09:44:59 +00:00
Henry Oswald
666bfdf967
stop the /announcements call at controller level
2016-11-11 17:15:36 +00:00
Henry Oswald
5a13ee1077
use anlaytis api
...
- don’t talk to postgres
- show recent blog post announcments
- proxy all events to analytics api
2016-11-11 17:03:09 +00:00
Shane Kilkelly
2cf2199964
WIP: enable non-csrf routes from modules
2016-11-11 13:48:29 +00:00
Shane Kilkelly
8726a8fb4d
Add passport-saml dependency
2016-11-11 09:09:00 +00:00
James Allen
c43c44e052
Merge pull request #370 from sharelatex/sk-sessions-cluster
...
Sk sessions cluster
2016-11-10 14:49:13 +00:00
James Allen
593e59450b
Use different UserSessions keys for cluster vs normal redis session store
2016-11-10 14:31:48 +00:00
Shane Kilkelly
c3860dd7a7
Remove stray commented-out code, use mapSeries instead of map.
2016-11-09 14:36:25 +00:00
Shane Kilkelly
f6de4cbb44
Merge branch 'master' into sk-sessions-cluster
2016-11-09 12:10:46 +00:00
Shane Kilkelly
5f3098df38
Replace multi-ops with Async.series, tests passing
2016-11-09 11:03:03 +00:00
Shane Kilkelly
a373868862
Fix unit tests
2016-11-08 16:00:18 +00:00
Shane Kilkelly
bfa0e7cf89
WIP: start moving web sessions to cluster
2016-11-08 15:32:36 +00:00
Henry Oswald
d556cbaacf
Merge pull request #361 from djwf/master
...
Pass ignoreTLS option to nodemailer
2016-11-08 11:26:42 +00:00