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

1634 commits

Author SHA1 Message Date
Henry Oswald
fed88504f8 rate limit emails sent sharing projects by users 2017-01-14 14:52:32 +00:00
Shane Kilkelly
25956d4c62 Fix up tests 2017-01-13 16:04:26 +00:00
Shane Kilkelly
525e871d55 Merge branch 'master' into sk-rate-limit-cluster 2017-01-13 14:17:18 +00:00
James Allen
aab4dea8ae Merge branch 'master' into ja-track-changes 2017-01-13 13:46:01 +01:00
Shane Kilkelly
d17483fd47 Merge branch 'sk-top-menu-rework' 2017-01-12 13:24:47 +00:00
Henry Oswald
daee77f052 Merge pull request #387 from sharelatex/pr-email-template-improvements 
Email template improvements
 2017-01-12 12:34:35 +00:00
James Allen
f9b8ada215 track changes for anonymous users 2017-01-12 13:29:57 +01:00
James Allen
64b9fe52dd Handle deleted users in comments gracefully 2017-01-12 12:31:01 +01:00
James Allen
e7ab92b7c9 Only show users controls they have permission to use 2017-01-12 11:52:39 +01:00
Shane Kilkelly
5c25d15a18 WIP: try switch to rolling rate limiter 2017-01-12 09:25:18 +00:00
Shane Kilkelly
731f280e2e Move auth parts of top menu out of config and into web templates. 
Move the remaining configuration into a new config var: `nav.header_extras`.
Add a `nav.showSubscriptionLink` var to control visibility of subscription link
in the Account menu.

This will allow admins to more easily configure extra links in the top
navigation bar, without the danger of overwriting the important auth menus.
 2017-01-11 10:27:38 +00:00
Shane Kilkelly
f5ced03074 Set redirect when sending user to login page. 
Allows smart redirecting to work when public access is turned off.
 2017-01-10 15:42:36 +00:00
James Allen
f31fa98679 Sync track changes state between sessions and client 2017-01-10 16:11:12 +01:00
James Allen
d03aa7056e Rename /ranges/users end point to /changes/users 2017-01-10 13:43:53 +01:00
James Allen
4e128b6ab7 Send user data in /threads dat 2017-01-09 17:25:06 +01:00
James Allen
43f6b9de7c Inform other clients when we accept a change 2017-01-09 15:54:12 +01:00
James Allen
9379cff89d Add end point for accepting change in doc updater 2017-01-09 15:25:27 +01:00
James Allen
3a5d45fa32 Get user info via web, not chat 2017-01-06 13:41:58 +01:00
Henry Oswald
862e15b842 log out user id and anonymous when loading editor 2017-01-05 15:02:10 +00:00
James Allen
84d9b2aa49 Save resolve and reopened state 2017-01-04 16:26:02 +01:00
Shane Kilkelly
7bbbfe20b9 If external auth is used, remove /register items from header nav. 
(logic moved from docker-image settings file)
 2016-12-21 13:50:13 +00:00
Shane Kilkelly
64f69069b2 Experimental: upgrade to node 6.9.2 (latest LTS release) 2016-12-21 10:23:42 +00:00
Shane Kilkelly
259c589076 Add option to restrict invites to existing user accounts. 2016-12-20 09:54:42 +00:00
Shane Kilkelly
822f76a883 Add unit tests for RedisWrapper 2016-12-19 15:12:22 +00:00
Shane Kilkelly
d428f9adbc Make LoginRateLimiter a thin wrapper around RateLimiter 2016-12-19 14:10:51 +00:00
Shane Kilkelly
03b541fb64 Fix small mistakes 2016-12-19 14:10:27 +00:00
Shane Kilkelly
9f787943b6 Remove stray redis imports. 2016-12-19 12:17:23 +00:00
Shane Kilkelly
ef0a5801d5 Create a RedisWrapper, and use it for rate limiting. 2016-12-19 12:17:02 +00:00
Paulo Reis
d6fcc21ab5 Add support for GMail go-to actions in the single CTA template. 2016-12-16 17:04:26 +00:00
James Allen
988005e929 Send and get comments via the chat api 2016-12-16 16:42:41 +00:00
Paulo Reis
869f729132 Fix forgotten templating function. 2016-12-16 15:15:06 +00:00
Paulo Reis
ca5040882f Use the new template in the join group email. 2016-12-16 14:57:59 +00:00
Paulo Reis
0fe3664a82 Use the new template in the reset pwd email. 2016-12-16 12:16:45 +00:00
Paulo Reis
2234c438a1 Support a secondary message in the single CTA email template. 2016-12-16 12:16:33 +00:00
Paulo Reis
7dfc2c61a6 Make the CTA button text configurable. 2016-12-16 10:06:56 +00:00
Paulo Reis
47a5eb5382 Add a new layout and body template for e-mails. 2016-12-15 17:22:39 +00:00
James Allen
293ba1fc4c Fetch all ranges from docstore when viewing overview panel 2016-12-09 15:43:08 +00:00
James Allen
1830d41eba Proxy ranges between doc updater and docstore 2016-12-08 14:09:06 +00:00
Henry Oswald
e6eeb86046 add read property to announcments 2016-12-07 11:39:22 +00:00
Shane Kilkelly
a5d2183441 if Recurly error, parse body xml rather than using regex match 2016-12-06 10:39:59 +00:00
Shane Kilkelly
58280bf6ee Merge branch 'master' into sk-user-delete-with-cancelled-sub 2016-12-06 09:31:42 +00:00
James Allen
48cc5a992f Merge branch 'master' into ja-set-version-in-docstore 2016-12-01 09:30:53 +00:00
Shane Kilkelly
e03d16e0cd Deleting user: if subscription is already cancelled, ignore and proceed. 2016-11-30 16:03:18 +00:00
Shane Kilkelly
d38890e9f4 Add the rolling option to session 2016-11-30 09:41:58 +00:00
James Allen
eb648b9bc8 Proxy version number to and from docstore 2016-11-29 17:16:56 +00:00
Henry Oswald
68ddf04fe8 to string record event check 2016-11-29 14:38:45 +00:00
Henry Oswald
6e9458e9e1 wip 2016-11-29 14:38:25 +00:00
Henry Oswald
aacdb1e96b to string record event check 2016-11-28 19:19:00 +00:00
Shane Kilkelly
a03ac8fe72 More robust session destruction after deleting user account. 2016-11-28 12:37:53 +00:00
Shane Kilkelly
52462d7020 Merge branch 'sk-sync-details-from-sso' 2016-11-28 10:11:59 +00:00
Shane Kilkelly
395135a655 Merge branch 'sk-post-login-redirect' 2016-11-28 09:52:14 +00:00
Shane Kilkelly
acce8853ba Remove redundant baseUrl from plans page. 2016-11-25 15:24:50 +00:00
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
Henry Oswald
d8e7bacec4 added logging in 2016-08-19 11:53:40 +01:00
Shane Kilkelly
c02854c9d8 Improve log messages 2016-08-19 11:52:50 +01:00
Shane Kilkelly
07cd75cd64 Add an expect404 option to apiRequest. 
Suppress error generation when 404 response is encountered.
 2016-08-19 11:52:04 +01:00
Henry Oswald
3d36dc7d6c mvp for not using cdn when blocked 2016-08-19 11:05:35 +01:00
James Allen
c653f59705 Add error handling to mkdir_p 2016-08-18 17:48:33 +01:00
Shane Kilkelly
4a6df04c21 Merge branch 'master' into pr-subscription-improvements 2016-08-18 12:53:56 +01:00
Shane Kilkelly
ece0491e3d Refactor. Handle republishing of notifications on resend. 2016-08-17 16:27:15 +01:00
Shane Kilkelly
85f49d6c9c Make whole 'red button' in email a link 2016-08-17 10:37:44 +01:00
Shane Kilkelly
4805c96584 Merge branch 'master' into pr-email-tokens 2016-08-17 08:52:24 +01:00
Shane Kilkelly
fc068b62a2 defend against undefined plan_code 2016-08-17 08:51:35 +01:00
Shane Kilkelly
81d0edf716 Improve error handling 2016-08-16 15:19:36 +01:00
Shane Kilkelly
ce78b855a3 Add counts to log message 2016-08-16 11:33:14 +01:00
Shane Kilkelly
da40f54d55 Improve logging, add acceptance tests for joinProject json 2016-08-16 11:17:45 +01:00
Shane Kilkelly
b68af254ff Correct logic for bailing out with no privileges 2016-08-16 09:59:42 +01:00
Brian Gough
7fcae775ee Merge pull request #297 from sharelatex/roll-out-chktex 
Roll out chktex
 2016-08-16 09:48:01 +01:00
Shane Kilkelly
d2183738c5 Improve logging for debugging 2016-08-16 09:04:11 +01:00
Brian Gough
8d6cdb03e8 restrict compile check options 
allowed options are validate/error/silent

validate = only run chktex, exit status 0
error = run compilation, exit(1) if chktex fails
silent = run chktex, but always do full compilation
 2016-08-15 16:46:53 +01:00
Shane Kilkelly
36d969e6e6 Set invites to be an empty array if missing 2016-08-15 15:22:23 +01:00
Shane Kilkelly
158afbb157 Merge branch 'master' into pr-email-tokens 
Conflicts:
	app/coffee/Features/Notifications/NotificationsBuilder.coffee
	public/coffee/ide/share/controllers/ShareController.coffee
 2016-08-15 10:29:21 +01:00
Shane Kilkelly
f92767f7b5 Address feedback, add ? checks where appropriate 2016-08-12 15:26:20 +01:00
Shane Kilkelly
e53394919f Rework how invite expiry functions. 2016-08-12 14:40:59 +01:00
Shane Kilkelly
a7bc8bffe0 Update markAsReadByKeyOnly url. 2016-08-12 09:59:25 +01:00
Shane Kilkelly
ce039f8cd3 Remove the email when user id is added to project 2016-08-11 14:17:01 +01:00
Paulo Reis
9bf9df9a4a Track login events. 2016-08-11 14:09:45 +01:00
Shane Kilkelly
826295167f Mark Notification as read by key alone 2016-08-11 14:04:11 +01:00
Paulo Reis
6a210978fe Track registration events. 2016-08-11 12:29:58 +01:00
James Allen
0270d34d0f Use JSONB not JSON column type 2016-08-11 10:19:07 +01:00
James Allen
4886e8ba0e Rename metadata -> segmentation in Events table to play well with metabase 2016-08-10 17:22:35 +01:00
James Allen
056bb6b0f4 Use a JSON column for metadata 2016-08-10 17:17:59 +01:00
James Allen
93cd511211 Send events to custom DB backend 2016-08-10 16:42:56 +01:00
Brian Gough
abcfb2dd16 Merge pull request #290 from sharelatex/enable-chktex 
Enable chktex
 2016-08-10 11:49:31 +01:00
Shane Kilkelly
0e0ccb41ff cancel notification when accepting invite 2016-08-08 13:57:33 +01:00
Shane Kilkelly
110082390e Test the _trySendInviteNotfification helper 2016-08-08 10:34:54 +01:00
Shane Kilkelly
9b46c1b1f7 WIP: notification when user is sent an invite 2016-08-05 16:11:03 +01:00
Shane Kilkelly
eafd61a90e Refresh members and invites in client when status changes 2016-08-05 14:01:08 +01:00
Shane Kilkelly
8f7603c324 Add an endpoint to access project members 2016-08-04 16:47:48 +01:00
Shane Kilkelly
092c036406 Rate-limit calls to invite api 2016-08-04 09:50:47 +01:00
Shane Kilkelly
721ea88bd0 If email is already invited, resend the invite 2016-08-03 16:30:34 +01:00
Shane Kilkelly
a5ddcc3df7 Allow resending of invites 2016-08-03 15:42:19 +01:00
Shane Kilkelly
e7251aab53 Small wording changes 2016-08-03 14:06:08 +01:00
Shane Kilkelly
6ea690225f Refactor view-invite to not use model calls. 2016-08-03 10:23:34 +01:00
Henry Oswald
892511820e fix logging on groupPlan invite notification 2016-08-02 17:09:42 +01:00
Shane Kilkelly
3a3688d3d0 Include invites count in canAddXCollaborators 2016-08-02 15:42:50 +01:00
Shane Kilkelly
2494026b85 Move Helpers/EmailHelpers to Helpers/EmailHelper 2016-08-02 15:42:26 +01:00
Henry Oswald
418d1c56da nullcheck qqfile on upload files 2016-08-02 15:36:59 +01:00
Henry Oswald
928777b61c add null check to redis return value for getValueFromTokenAndExpire 2016-08-02 15:34:44 +01:00
Henry Oswald
2ad0bab976 use underscore.each so it doesn’t blow up on non array. 2016-08-02 15:33:41 +01:00
Shane Kilkelly
13fe000176 Move email parsing code to Helpers/EmailHelpers 2016-08-02 14:30:42 +01:00
Shane Kilkelly
abbd059eae Refactor to existing addUserIdToProject function 2016-08-02 13:51:00 +01:00
Shane Kilkelly
63f8fe453a Use UserGetter rather than User model 2016-08-02 09:48:09 +01:00
Shane Kilkelly
dca1c9be5d Load invites on project load, rather than asynchronously. 2016-08-01 17:05:37 +01:00
Shane Kilkelly
291a26595c Remove referal id from invite email link 2016-08-01 15:56:07 +01:00
Brian Gough
5da1b90418 use validate as keyword for syntax checks 2016-07-29 14:59:48 +01:00
Brian Gough
e0d5075fdb include check option when compiling 2016-07-29 14:59:48 +01:00
Shane Kilkelly
f3a1f32bb1 Test the invalid-invite page 2016-07-29 11:54:08 +01:00
Shane Kilkelly
563247044b Start testing the invite page 2016-07-29 09:52:55 +01:00
Shane Kilkelly
9c6195fbec Factor out link builder 2016-07-28 15:59:59 +01:00
Shane Kilkelly
7b18f88145 Merge branch 'master' into pr-email-tokens 2016-07-28 14:53:36 +01:00
Shane Kilkelly
ed65e16e54 If user is member of project, redirect to project. 
Leave invite in place to expire naturally.
 2016-07-28 11:15:11 +01:00
Shane Kilkelly
1cb9c3582d Don't return early if user is already member. 2016-07-28 09:47:07 +01:00
Shane Kilkelly
e70f121461 Correct name of expireAfterSeconds index 2016-07-27 15:55:31 +01:00
Shane Kilkelly
62d544ccfc Redirect to project if user is already member. 
If invite is missing, and current user is already a member
of the project, then just redirect to the project page
 2016-07-27 15:28:22 +01:00
Shane Kilkelly
827629a74a Invalid-invite page, and re-jigg the share modal 2016-07-27 10:10:44 +01:00
Shane Kilkelly
6162c5ec60 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-07-26 14:23:08 +01:00
Shane Kilkelly
e46901a21b Send an empty keys array when there is no data 2016-07-26 14:23:00 +01:00
Shane Kilkelly
855cc28483 Finish adding project and owner details to the accept-invite page 2016-07-26 14:14:14 +01:00
Shane Kilkelly
2dede5f793 WIP: Working "accept invite" page 2016-07-26 11:46:41 +01:00
Henry Oswald
81744e4301 use cdn for blog 2016-07-26 11:11:28 +01:00
Shane Kilkelly
b898c62e91 Add appropriate query strings to the end of invite link 2016-07-25 16:14:41 +01:00
Shane Kilkelly
16dcbe2cd4 WIP: wire up share-modal frontend to invite system 2016-07-25 15:07:14 +01:00
Shane Kilkelly
73fed8b0bf Add a getAllInvites api endpoint 2016-07-25 11:17:47 +01:00
Shane Kilkelly
5438f39f9e Start testing acceptInvite 2016-07-25 09:58:08 +01:00
Shane Kilkelly
78a410c39d Remove expiresAt logic from acceptInvite 2016-07-25 09:07:47 +01:00
Shane Kilkelly
78570817d5 Render a separate template if the invite is not found. 2016-07-22 16:28:00 +01:00
Shane Kilkelly
9e0c44573a Remove expiresAt, use mongo TTL instead. 2016-07-22 16:08:56 +01:00
Shane Kilkelly
b201f1a37a Test getInviteByToken. 2016-07-22 14:21:34 +01:00
Henry Oswald
8492ea7d28 Merge pull request #285 from sharelatex/file-path-checks 
add file path check on element names
 2016-07-22 13:54:05 +01:00
Henry Oswald
f7a0860f0b Merge pull request #286 from sharelatex/ha-editor-close 
fix close editor button
 2016-07-22 13:49:26 +01:00
Shane Kilkelly
9fba98cd45 Accept invite, and start testing the invite handler. 2016-07-22 11:38:00 +01:00
Shane Kilkelly
1139444790 add token to body of acceptInvite action. 2016-07-22 09:27:00 +01:00
Henry Oswald
c7a3de45bb Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-07-22 09:05:14 +01:00
Henry Oswald
3029fb6335 add dark host option and don’t load pdfjs worker via cdn 2016-07-21 19:06:53 +01:00
Paulo Jorge Reis
50ad3a107f Merge pull request #287 from sharelatex/pr-highlight-biblio-search 
A|B test for bib search pop-up
 2016-07-21 17:06:59 +01:00
Paulo Reis
6a46b46cf4 Expose sign-up date as an user attribute in the editor. 2016-07-21 16:42:22 +01:00
Shane Kilkelly
546517db90 revokeInvite and getInviteByToken functions. 2016-07-21 16:19:15 +01:00
Shane Kilkelly
d9c6df0e47 start adding the ProjectInvite workflow. 2016-07-21 15:56:41 +01:00
Henry Oswald
6aca798a45 don’t use cdn on dark 2016-07-21 15:34:23 +01:00
Shane Kilkelly
e0562a2301 Update ProjectInvite model 2016-07-21 14:20:09 +01:00
Shane Kilkelly
3311b43644 more tests for invite controller 2016-07-21 13:31:54 +01:00
Shane Kilkelly
23a9aadba5 start tests for invite controller 2016-07-21 10:08:22 +01:00
Shane Kilkelly
c3e51dd773 Revert "copy helper functions from CollaboratorsHandler" 
This reverts commit 0d5acd7bade584e4ff119dc22e5d5d3b3175dae2.
 2016-07-21 09:50:52 +01:00
Shane Kilkelly
049cced4fd copy helper functions from CollaboratorsHandler 2016-07-21 09:42:37 +01:00
Henry Oswald
ad60268707 clean up vars for buildjs path and change default to cdn.sharelatex.dev:3000 2016-07-21 09:38:24 +01:00
Shane Kilkelly
0f2600b198 finish out skeleton of invite controller 2016-07-21 09:32:14 +01:00
Shane Kilkelly
f7c2fa37ab Fill out getInviteByToken 2016-07-20 16:44:22 +01:00
Henry Oswald
e27d5ce969 use Url for lib name 2016-07-20 16:10:33 +01:00
Shane Kilkelly
0dc4e2c0c1 Merge branch 'master' into pr-email-tokens 2016-07-20 15:23:37 +01:00
Shane Kilkelly
5b22be8a0b Further scaffolding 2016-07-20 15:22:48 +01:00
Henry Oswald
596fc2525b simplified buildJSPath 2016-07-20 14:48:58 +01:00
Henry Oswald
a3e40adbaf Merge pull request #283 from sharelatex/ho-cdn 
Ho cdn
 2016-07-20 14:19:37 +01:00
Shane Kilkelly
a4c7db5f20 skeleton of inviteToProject function 2016-07-20 14:14:56 +01:00
Shane Kilkelly
e383e49161 Add CollaboratorsInviteController and routes 2016-07-20 14:04:14 +01:00
Henry Oswald
6c78ab4ace got requirejs working nicely with cdn 2016-07-20 12:58:32 +01:00
Henry Oswald
b589ab388f fix close editor button 
- only evaulate close on web router, not api/static assets
- allow /admin pages to still be available
 2016-07-19 17:15:20 +01:00
Henry Oswald
f8c38f30a8 got build js path working with mathjax 2016-07-19 15:41:33 +01:00
Brian Gough
13d6448ab8 Merge pull request #284 from sharelatex/fix-synctex-subdir-path 
work around for synctex paths containing /./
 2016-07-19 12:24:31 +01:00
Brian Gough
a93efde1ae add file path check on element names 2016-07-19 11:58:10 +01:00
Henry Oswald
0cbd9d0ff9 use url.resolve to adding https:// part 2016-07-19 11:41:36 +01:00
Shane Kilkelly
3aea3a68d1 Check the truth of subscription.customAccount, rather than definition. 2016-07-19 10:28:43 +01:00
Shane Kilkelly
effc3727be Don’t show upgrade prompts for users with custom subscription accounts. 
Set `hasValidSubscription` to true if user subscription is custom.
 2016-07-19 10:15:45 +01:00
Henry Oswald
a2a8b7123b created buildCssPath img and js path funcs 2016-07-18 17:18:51 +01:00
Brian Gough
1d74e6750c work around for synctex paths containing /./ 2016-07-18 17:00:34 +01:00
James Allen
62a444082d Add in /dev/csrf endpoint for easy automated testing 2016-07-18 16:47:54 +01:00
Henry Oswald
715ffcfbf2 changed ordering on static assets path, just tidying. 2016-07-18 16:24:48 +01:00
Henry Oswald
c21549220c mvp for cdn 2016-07-18 14:05:07 +01:00
Brian Gough
92d41dd74e added comment for per-user route to top-level directory 2016-07-18 11:16:09 +01:00
Brian Gough
5a02e8c656 add support for stopping compile 2016-07-15 16:28:52 +01:00
Shane Kilkelly
0e9beb5653 remove daft redundancy. 2016-07-07 09:42:01 +01:00
Shane Kilkelly
9e35bdcaea Refactor: add ? suffix to truth tests. 2016-07-07 09:35:44 +01:00
Shane Kilkelly
dda0841af3 Return early if there are no keys to delete 2016-07-06 15:39:03 +01:00
Shane Kilkelly
fc6cf75ad5 Merge branch 'master' into sk-session-revocation 2016-07-06 13:19:15 +01:00
Shane Kilkelly
3f1a47eccb map the 'retain' values to session ids 2016-07-05 14:54:26 +01:00
Shane Kilkelly
5b9903551a add an array of session ids to retain. 2016-07-05 14:20:47 +01:00
Shane Kilkelly
6e282ab308 clear sessions on password reset 2016-07-05 14:19:59 +01:00
Shane Kilkelly
df0a7bc547 test the _checkSessions function. 2016-07-04 14:04:10 +01:00
Shane Kilkelly
2ae2e6ed4f Test trackSession 2016-07-04 10:37:01 +01:00
Shane Kilkelly
a869c99c60 Begin testing UserSessionsManager. 2016-07-04 10:05:34 +01:00
Shane Kilkelly
5a1af9a5f3 check sessions on login and logout. 2016-07-04 09:27:38 +01:00
Shane Kilkelly
6f20f565fe Add early-return guards 2016-07-01 15:55:50 +01:00
Shane Kilkelly
0ac9b05d02 Add ip_address and session_created to the session user object. 2016-07-01 15:49:07 +01:00
Shane Kilkelly
f1653d01b7 Refactor method names in UserSessionsManager 2016-07-01 15:33:59 +01:00
Shane Kilkelly
6938f1d055 No need to build extra string 2016-07-01 15:04:13 +01:00
Shane Kilkelly
8855d0fa0f Clear out sessions 2016-07-01 13:38:13 +01:00
Shane Kilkelly
5ae0aeaf94 Fix logging. 2016-07-01 13:37:56 +01:00
Shane Kilkelly
d8ffa5b4b1 set expiry on the user sessions set. 2016-07-01 11:24:46 +01:00
Shane Kilkelly
88bef5c5ea Add revokeAllSessions handler, when password is reset 2016-07-01 09:51:22 +01:00
Brian Gough
ea942fe255 Merge pull request #269 from sharelatex/remove-migration-to-per-user-containers 
remove scaffolding for per-user compiles so that it is always by default
 2016-06-30 15:16:28 +01:00
Brian Gough
c04e00026b remove scaffolding for per-user compiles so that it is always by default 2016-06-30 14:43:03 +01:00
James Allen
882e28a811 Don't choke on null projects 2016-06-30 14:30:04 +01:00
James Allen
b76cc7e314 Remove a user from being a collaborator when their account is deleted 2016-06-30 14:21:44 +01:00
James Allen
a0fcc7e3ed Skip null user objects when getting collaborators 2016-06-30 13:56:21 +01:00
Henry Oswald
000c862ae1 return 404 if blog returns 403, caused by file not existing 2016-06-29 15:36:33 +01:00
Shane Kilkelly
03fedafaf5 save the session key string, rather than just the id 2016-06-29 15:12:12 +01:00
Shane Kilkelly
db213c0621 Begin keeping record of user sessions in reds. 2016-06-29 11:35:25 +01:00
Henry Oswald
8f14526354 added custom footer in email option 2016-06-28 17:07:27 +01:00
Henry Oswald
88fb955884 hook notifications handler up to make request which doesn't make request if url not set 2016-06-28 16:52:27 +01:00
Shane Kilkelly
9e16f250f9 Merge branch 'sk-subscription-address' 2016-06-28 14:16:34 +01:00
Shane Kilkelly
6581bc4ecf set postal_code as zip 2016-06-28 14:15:47 +01:00