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

2878 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Shane Kilkelly
e34b124c73 Test revokeInvite 2016-07-22 13:33:21 +01:00
Shane Kilkelly
c9cfcddbe9 test error case for inviteToProject 2016-07-22 11:54:16 +01:00
Shane Kilkelly
f866bd03bc Spy on the randomBytes function 2016-07-22 11:53:55 +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
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
Shane Kilkelly
e0562a2301 Update ProjectInvite model 2016-07-21 14:20:09 +01:00
Shane Kilkelly
4db9d5a466 remove whatespace and comment 2016-07-21 13:34:20 +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
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
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
e8aad2abb1 don’t fingerprint main.js and ide.js 2016-07-20 15:17:01 +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
Brian Gough
fcfdabd279 clean up pdfcontroller query string logic 2016-07-20 09:58:47 +01:00
Brian Gough
4e252976c7 add missing cache bust on log file 2016-07-20 09:58:47 +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
Henry Oswald
0cbd9d0ff9 use url.resolve to adding https:// part 2016-07-19 11:41:36 +01:00
Shane Kilkelly
4e1df9f476 Fix wording of userHasSubscription to userHasNoSubscription 2016-07-19 11:37:58 +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
Shane Kilkelly
9f9852a1dd Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-07-18 16:07:24 +01:00
Shane Kilkelly
57079fc986 fix styling of the import modal 2016-07-18 16:07:00 +01:00
Brian Gough
a3c97533ae Merge pull request #281 from sharelatex/stop-compile 
add support for stopping compile
 2016-07-18 15:01:26 +01:00
Brian Gough
ded9bcaa11 remove unwanted styling on 'stop compile' button 2016-07-18 15:00:16 +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
Henry Oswald
0576380811 allow placeholder for sharing project to be changed 2016-07-14 11:40:32 +01:00
Henry Oswald
4202b4795b fix ordering of deps for contact us 2016-07-14 11:15:44 +01:00
Paulo Reis
c23091da94 Always set feature flags, if available. 2016-07-14 11:07:10 +01:00
Paulo Jorge Reis
e4e6c58423 Merge pull request #280 from sharelatex/pr-user-segmentation 
User segmentation
 2016-07-14 10:15:16 +01:00
Paulo Jorge Reis
0b21f8f4f1 Merge pull request #279 from sharelatex/pr-track-trial-start 
Track trial start and subscription
 2016-07-14 10:14:49 +01:00