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 |
|
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
|
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
|
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
|
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
|
15564102a0
|
Update ProjectController.coffee
|
2016-11-15 10:34:57 +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 |
|
Henry Oswald
|
47ed17aab3
|
remove unneeded package and comma in jade
|
2016-11-14 10:50:49 +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 |
|
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
|
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 |
|
Brian Gough
|
6f41dddb42
|
disable spell check for anonymous users
these requests always fail
|
2016-11-04 16:03:18 +00:00 |
|
Brian Gough
|
307f08e6bb
|
Merge pull request #363 from sharelatex/bg-lock-editor-when-connection-down
lock editor when connection down
|
2016-11-04 11:04:30 +00:00 |
|
Brian Gough
|
49a06f8489
|
modal for lost connection
|
2016-11-03 12:37:44 +00:00 |
|
James Allen
|
091eb7e462
|
Merge branch 'master' into ja-review-panel
Conflicts:
public/coffee/ide.coffee
public/stylesheets/app/editor.less
|
2016-11-03 10:07:37 +00:00 |
|
David J. Weller-Fahy
|
5efee51ed8
|
Pass ignoreTLS option to nodemailer
|
2016-11-02 13:14:54 -04:00 |
|
Paulo Reis
|
559350eaa2
|
Avoid showing the history upgrade teaser when user is not the project owner.
|
2016-11-02 16:08:47 +00:00 |
|
Shane Kilkelly
|
e7b09a81a7
|
Merge branch 'sk-passport-ldap'
|
2016-11-02 15:39:32 +00:00 |
|
Paulo Jorge Reis
|
74d8fb103b
|
Merge pull request #358 from sharelatex/pr-latex-linter-onboarding
Code-checker onboarding
|
2016-11-02 13:58:06 +00:00 |
|
Henry Oswald
|
fde9ab60cc
|
remove left-menu-upgraed-rotation ab test
|
2016-11-02 10:24:03 +00:00 |
|
Henry Oswald
|
11a097c9a6
|
remove some old sixpack tests
|
2016-11-02 10:09:12 +00:00 |
|
Shane Kilkelly
|
a63f7685b8
|
Move the planCode logic for Collaborator into a helper function.
|
2016-11-02 09:56:33 +00:00 |
|
Paulo Reis
|
c18114bfeb
|
Different strategy for highlighting the code-check setting.
|
2016-11-01 17:30:27 +00:00 |
|
Paulo Reis
|
840d52ef1a
|
Remove default value from user model, but add it upon creation (i.e. affecting new users).
|
2016-11-01 16:36:26 +00:00 |
|
Paulo Reis
|
8c182c2ccd
|
Show code-check option for non-beta users.
|
2016-11-01 15:26:26 +00:00 |
|
Brian Gough
|
585f8681ea
|
enable syntax validation for all users
(by defining aceWorker)
|
2016-11-01 15:02:32 +00:00 |
|
Shane Kilkelly
|
9cb3d8c4b8
|
Enable hook from module into passport init.
|
2016-11-01 14:06:54 +00:00 |
|
Paulo Reis
|
06629e05d4
|
Include teaser media and do some style adjustments.
|
2016-11-01 11:36:21 +00:00 |
|
Paulo Reis
|
aa58b70d43
|
Improve visibility logic.
|
2016-10-31 20:18:08 +00:00 |
|
James Allen
|
8368577867
|
Merge branch 'master' into ja-review-panel
Conflicts:
app/views/project/editor/editor.jade
public/coffee/ide.coffee
public/coffee/ide/editor/directives/aceEditor.coffee
|
2016-10-31 16:42:55 +00:00 |
|
Paulo Reis
|
97b92928dc
|
Merge branch 'master' into pr-latex-linter-onboarding
|
2016-10-28 16:36:10 +01:00 |
|
Paulo Reis
|
4721fd450c
|
Improve condition to avoid linking sixpack directives when project loads.
|
2016-10-28 14:40:04 +01:00 |
|
Paulo Reis
|
8157f68393
|
Avoid linking sixpack directives when project loads.
|
2016-10-28 14:23:16 +01:00 |
|