Commit Graph

6735 Commits

Author SHA1 Message Date
Shane Kilkelly 2dede5f793 WIP: Working "accept invite" page 2016-07-26 11:46:41 +01:00
Paulo Reis bfe3e160c9 Integrate with UI. 2016-07-26 11:37:51 +01:00
Henry Oswald 81744e4301 use cdn for blog 2016-07-26 11:11:28 +01:00
Shane Kilkelly 41755212f0 Update the register page with new message 2016-07-26 09:06:21 +01:00
Shane Kilkelly b898c62e91 Add appropriate query strings to the end of invite link 2016-07-25 16:14:41 +01:00
Paulo Reis 32b57f228c Integrate feedback UI with wufoo service. 2016-07-25 16:12:56 +01:00
Shane Kilkelly 16dcbe2cd4 WIP: wire up share-modal frontend to invite system 2016-07-25 15:07:14 +01:00
Shane Kilkelly b3add65de1 Start integrating invites into share frontend 2016-07-25 14:27:02 +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
Paulo Reis 37eb6252d2 Rewording + animation when shown the feedback panel. 2016-07-22 16:33:19 +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
Paulo Reis b6cd6c2d7d UI logic to show or hide the negative feedback panel. 2016-07-22 14:14:58 +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
Paulo Reis 54eadf3256 Add textarea for 'other' feedback + styles. 2016-07-22 12:20:26 +01:00
Paulo Reis 95db6ba934 Basic mark-up for the extra log hint feedback. 2016-07-22 11:56:45 +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 ef6eefe1b1 add comment not to fingerprint worker 2016-07-22 09:05:39 +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
Henry Oswald 97b42478d1 don’t fingerprint sentry 2016-07-20 16:03:01 +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
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