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
4059 commits 3 branches 7 tags 206 MiB
Commit graph

1382 commits

Author SHA1 Message Date
Shane Kilkelly
2ab5ad4230 If we're updating details from a SSO source, don't allow editing on settings page. 2016-11-25 14:38:00 +00:00
Henry Oswald
4b59fdd453 added missing settings file to announcments controller 2016-11-25 11:59:50 +00:00
Henry Oswald
f130470971 log ip address of user when logging in 2016-11-25 11:59:50 +00:00
Shane Kilkelly
167f01857a Remove stray next params. 2016-11-24 14:15:01 +00:00
Shane Kilkelly
22101d0305 If user is sent to login page with explicit redirect, obey 2016-11-24 11:38:13 +00:00
Shane Kilkelly
cee3326ce3 fix omission of 'length' 2016-11-22 17:06:05 +00:00
Shane Kilkelly
8a4352fff2 Set redirect when redirecting from restricted 2016-11-22 16:54:03 +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
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
David J. Weller-Fahy
5efee51ed8 Pass ignoreTLS option to nodemailer 2016-11-02 13:14:54 -04:00
Shane Kilkelly
e7b09a81a7 Merge branch 'sk-passport-ldap' 2016-11-02 15:39:32 +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
Shane Kilkelly
9cb3d8c4b8 Enable hook from module into passport init. 2016-11-01 14:06:54 +00:00
Shane Kilkelly
5c8cdd22cc Merge branch 'sk-account-delete-pass' 2016-10-28 11:02:41 +01:00
Shane Kilkelly
4c092e7ff1 Remove deprecated "projectSharedWithYou" email. 2016-10-28 10:37:10 +01:00
Shane Kilkelly
751a116921 add plainTextTemplate to all emails 2016-10-27 14:41:13 +01:00
Shane Kilkelly
1538f140f3 update test timestamp 2016-10-27 09:41:51 +01:00
Shane Kilkelly
dfd13e0815 Update AB test timestamp 2016-10-26 14:24:00 +01:00
Shane Kilkelly
d912c3b487 Merge branch 'master' into sk-plans-tidy 2016-10-26 13:47:26 +01:00
Shane Kilkelly
dc62b1a86e Remove deprecated endpoint for old delete-user 2016-10-26 11:18:36 +01:00
Shane Kilkelly
fc7bd4c2d3 fix logging 2016-10-26 10:57:34 +01:00
Shane Kilkelly
1c8721ceab Functioning account deletion with password 2016-10-25 16:23:50 +01:00
Brian Gough
baf09e4f3a avoid exception in LoggerSerializers 2016-10-25 15:50:05 +01:00
Brian Gough
bb06b97b3c avoid exception in logging null user 2016-10-25 15:01:59 +01:00
Shane Kilkelly
efe6df145c WIP: ask for password when deleting account 2016-10-25 14:33:47 +01:00
Brian Gough
3519fbe337 add worker-latex.js to fingerprints 2016-10-25 14:18:37 +01:00
Shane Kilkelly
6069d4dba3 Merge branch 'master' into sk-plans-tidy 2016-10-25 13:14:44 +01:00
Henry Oswald
450946212a log out health check failures 2016-10-21 18:59:28 +01:00
Shane Kilkelly
8c1d110688 Remove debug logs 2016-10-21 16:21:21 +01:00
Shane Kilkelly
d5a7514923 Add AB test for plans (+15 squashed commits) 
Squashed commits:
[45c2237] Add a `subscription-form-switch-to-student` event
[1ad9b8f] change experiment name, and re-enable switch-to-student workflow
[f7cdb78] Remove debug
[4b9778a] Incorporate collaborator alternative plans
[701e80b] Add collaborator plans for heron and ibis
[287aa0f] AB test plans from editor page
[c74052e] Fix change-plan view for default plans
[1a947d6] Use correct plan codes
[1eecda7] Adjust prices
[69c4c7b] Introduce two plans
[8b8d5f8] Rename sixpack experiment
[c332002] Fix up the change-plan page
[c7af52d] Overhaul change-plan page, show only plans from current generation
[33d86bf] update plan
[5bbd946] Add a basic plans AB test
 2016-10-21 16:17:37 +01:00
Henry Oswald
1beca53b3d project name should be clickable href in invite email 2016-10-18 15:53:56 +01:00
Brian Gough
cf09a9ed83 Merge pull request #344 from sharelatex/bg-upgrade-pdfjs 
upgrade pdfjs
 2016-10-14 17:03:13 +01:00
Henry Oswald
a02da61cb0 fixed email sender tests looking for wrong settings 2016-10-14 16:43:59 +01:00
Brian Gough
27a8dc1dfd upgrade pdfjs to 1.6.210p1 2016-10-13 16:10:01 +01:00
Henry Oswald
bfeb7e082f added textEncoding option for email 2016-10-13 14:22:08 +01:00
Henry Oswald
65e48652ee don't add second slash into uni redirect 2016-10-10 15:36:12 +01:00
Henry Oswald
adc6b429e6 record when a subscription is canceled 2016-10-10 15:29:54 +01:00
Henry Oswald
92e3101d81 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-10-10 15:29:06 +01:00
Shane Kilkelly
c4fd9f3bce Merge branch 'master' into sk-session-button 2016-10-10 14:49:55 +01:00
Shane Kilkelly
9d3baf488f Use the query operator for existence check 2016-10-10 13:28:03 +01:00
Shane Kilkelly
a722646040 Remove un-used module 2016-10-10 11:05:14 +01:00
Henry Oswald
101896a754 redirect to /i/ university 2016-10-07 17:10:58 +01:00
Shane Kilkelly
25dd998107 clear-sessions page (+4 squashed commits) 
Squashed commits:
[3a56af0] Remove cruft
[c5a1f6c] Finalise alignment
[82f741a] Working sessions page
[d40f069] WIP: display sessions
 2016-10-07 16:47:00 +01:00
Brian Gough
d2db6663e5 Merge pull request #335 from sharelatex/bg-ace-syntax-validator 
add ace syntax validator with latex parsing
 2016-10-07 15:05:34 +01:00
Brian Gough
2d1a0b34d5 Merge pull request #333 from sharelatex/support-package-versions 
Support package versions
 2016-10-07 15:04:59 +01:00
Shane Kilkelly
894c549ec6 WIP: display sessions on a page 2016-10-06 15:49:47 +01:00
Brian Gough
8c7d712738 update live version of ace to 1.2.5 2016-10-06 14:20:23 +01:00
Brian Gough
9177544ed9 add left menu for syntax validator 2016-10-06 11:51:24 +01:00
Brian Gough
837151a395 include moment in package versions 2016-10-05 14:54:42 +01:00
Brian Gough
8b6425317f introduce PackageVersions module 
put all package versions in one central place
 2016-10-05 14:54:42 +01:00
Shane Kilkelly
95a66bbf00 Merge pull request #328 from sharelatex/sk-plain-text-email 
Sk plain text email
 2016-10-05 10:04:08 +01:00
Henry Oswald
3141f91b59 Merge pull request #322 from sharelatex/ho-password-limits 
Ho password limits
 2016-10-05 10:03:54 +01:00
Shane Kilkelly
e699fcb1fa Add plain-text component to the project-invite email 2016-10-03 15:25:38 +01:00
Shane Kilkelly
b42a3b9188 Fix logging typo 2016-10-03 15:25:18 +01:00
Henry Oswald
4f3b57ceeb cleaned up comments 2016-09-27 16:23:40 +01:00
Henry Oswald
a00cb707cc fingerprints are grouped into lists with this change 
fingerprints are shared when require.js pulls in other resources.
this change means changes to either ace.js or mode-latex.js will
result in different fingerprints for those files.
 2016-09-27 16:21:04 +01:00
Henry Oswald
6141eb4a44 null check user_id 2016-09-26 17:25:11 +01:00
Henry Oswald
8558ce1f75 improve error handling in update merger 2016-09-26 13:57:57 +01:00
Shane Kilkelly
dd14e51713 Handle null, undefined and false in isUserLoggedIn 2016-09-23 16:53:07 +01:00
Henry Oswald
8a2b7d0461 server side protect passwords which are too long 2016-09-23 16:51:46 +01:00
Henry Oswald
0d0f0e8604 wip 2016-09-23 16:38:46 +01:00
Shane Kilkelly
f9030a0a38 get user_id directly 2016-09-23 16:25:23 +01:00
Shane Kilkelly
7384a08cb4 Pass req to function. 2016-09-23 16:21:07 +01:00
Shane Kilkelly
02587377a2 Remove ReferalMiddleware, dead code. 2016-09-23 14:42:57 +01:00
Shane Kilkelly
72ca1d6316 Merge branch 'master' into sk-passport 
# Conflicts:
#	app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
 2016-09-23 10:01:11 +01:00
James Allen
e15976be21 Use token in URL to force its precense when invite and allow easy dynamic notifications 2016-09-22 17:24:06 +01:00
Shane Kilkelly
dbac4bd008 update session when user settings change 2016-09-22 16:58:25 +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
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
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
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
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
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
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
c9a17982cf Add canonical url tag and don't include query string 2016-09-14 17:08:26 +01:00
James Allen
53b3e3831d Update cancellation survey link 2016-09-14 10:51:19 +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
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
Shane Kilkelly
b0a10c948c wip refactor 2016-09-06 15:22:13 +01:00
Shane Kilkelly
749658a916 WIP: fixing acceptance tests 2016-09-06 13:21:22 +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
e4f4325150 Basic passport integration 2016-09-02 16:17:37 +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
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
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
Brian Gough
c44f33ce99 allow negative values for synctex positions 2016-08-30 16:45:21 +01:00
Shane Kilkelly
4a76fcd13b Change first param of getMemberSubscriptions to user_or_id, to match semantics of usage. 
This function works whether a user object, or an ObjectId is passed, but the `user_id`
param name is confusing.
 2016-08-30 14:26:57 +01:00
Henry Oswald
cbb4ee88cc Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-08-30 13:08:09 +01:00
Henry Oswald
ddc0023c64 make forceCreate the default for creating notifications 2016-08-30 13:07:37 +01:00
Henry Oswald
8c18153d5c Merge pull request #304 from sharelatex/ho-jade-speedup 
Ho jade speedup
 2016-08-30 12:47:08 +01:00
Henry Oswald
26a4076c22 add redirect to /i/university for ab test 2016-08-25 10:48:29 +01:00
Henry Oswald
3f4e888af5 Merge pull request #305 from sharelatex/cdnfallback 
don't use cdn if it can not be accessed
 2016-08-24 09:45:14 +01:00
Henry Oswald
934e908697 just use plain req.ip for logging 2016-08-23 17:00:13 +01:00
Henry Oswald
f8799334ec Merge branch 'master' into ho-jade-speedup 2016-08-23 15:35:04 +01:00
Henry Oswald
114dbf9f3f Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-08-23 15:34:55 +01:00
Henry Oswald
d3ebdb64b2 precompile the jade partial views 2016-08-23 15:31:09 +01:00
James Allen
bcc8bfbe6c Redirect to working update billing details end point that shows a nice message 2016-08-22 17:36:33 +01:00
Shane Kilkelly
11ec486c13 Merge pull request #300 from sharelatex/pr-subscription-improvements 
Pr subscription improvements
 2016-08-22 11:08:18 +01:00
Shane Kilkelly
03aa9b87f1 Add debug query string origin to invocations of the updateSubscription endpoint. 2016-08-22 10:09:54 +01:00
Henry Oswald
130fece0f6 track when users accept invites 2016-08-19 18:33:03 +01:00
Henry Oswald
50b3403983 use url.resolve to build url for freegeoip lookups 2016-08-19 15:39:58 +01:00