Henry Oswald
43c4531e51
kill off CollaboratorsHandler. changeUsersPrivilegeLevel as it is not used anywhere
2015-05-28 13:02:08 +01:00
Henry Oswald
22b94e9246
renamed SubscriptionDomainAllocator -> SubscriptionDomainHandler
2015-05-27 20:57:54 +01:00
Henry Oswald
4773d6d22f
added tests around new endpoints for joining groups
2015-05-27 20:50:16 +01:00
Henry Oswald
f27c072ae1
pull logic checking if user is already part of a group out of controller into handler
2015-05-27 16:33:47 +01:00
Henry Oswald
72e528e9d1
if you are alread in the group show the custom group page
2015-05-27 15:50:28 +01:00
Henry Oswald
79fa49a43d
if a user is elelable to be part of a group subscription and they go to
...
/user/subscription it should redirect them to the group subscription invite
2015-05-27 15:35:31 +01:00
Henry Oswald
1d21bddcf5
fix Onetime token handler path
2015-05-27 15:06:36 +01:00
Brian Gough
a5d14f4ffb
handle unexplained case where smokeTestModule is undefined
2015-05-26 16:33:02 +01:00
Henry Oswald
481bd67fbd
changed paths to use hyphens and add succesfull join page
2015-05-26 15:26:45 +01:00
Henry Oswald
841231dbf8
make PasswordResetTokenHandler generic so it can be used for invites
2015-05-26 15:24:09 +01:00
Brian Gough
e51cdb81bd
port leak fixes from smoke-test-sharelatex module
2015-05-26 10:54:55 +01:00
Henry Oswald
cad8d8a23b
v1 basic invite works, not pretty or tested
2015-05-22 13:57:15 +01:00
Henry Oswald
f5c39efcac
patched xss hole with messages not setting the content type correctly
2015-05-19 11:04:52 +01:00
Henry Oswald
9764ab258b
added complex password validation to password resets
2015-04-30 12:05:46 +01:00
Henry Oswald
312c56a24e
allow password resets to be performed when site is not public by adding routes into white list
2015-04-30 11:58:26 +01:00
Henry Oswald
a7640b5bbd
changed authentication controller to use req.parsedUrl.pathname as query strings on req.url were breaking the whitelist
2015-04-30 11:57:40 +01:00
Henry Oswald
6669884f44
Merge branch 'tpds-cleanup'
2015-04-23 10:06:26 +01:00
Brian Gough
396644d314
proposed fix to delete tpds dump files after use
2015-04-15 14:41:38 +01:00
James Allen
5c30a7de67
Add in option for global login requirement (defaults to on)
2015-04-15 11:14:53 +01:00
James Allen
893ff85521
Don't allow password resets for holding accounts
2015-04-14 13:11:49 +01:00
James Allen
8483f249ee
Actually proxy websocket connections
2015-03-20 19:08:48 +00:00
James Allen
393169bc2a
Create a grunt task to create the admin user
2015-03-19 17:36:50 +00:00
James Allen
e2d515f957
Allow public registration module to hook into email system
2015-03-19 17:19:56 +00:00
James Allen
9b8cf7bcfa
Remove public registration and require that a user be registered by an admin
2015-03-19 14:22:48 +00:00
James Allen
93a088618a
Return proper error from registration handler
2015-03-18 16:19:48 +00:00
James Allen
cb948fede2
Move email sending into registration controller
2015-03-18 15:57:01 +00:00
James Allen
0f69ee0f22
Add in proxy for /socket.io so that we don't need to faff with real-time service location
2015-03-09 14:09:09 +00:00
Henry Oswald
97f0fad525
add vat number option to payment form
2015-03-04 18:08:06 +00:00
Henry Oswald
80dc2f9224
send coupon code server side to be applied to users subscription
2015-03-04 17:50:24 +00:00
Henry Oswald
fe3b9bf07a
clients can not rename docs/files/folders to blank name.
...
Client and server side checks added
2015-03-04 11:10:59 +00:00
Brian Gough
c1cde643ef
use send build identifier to clsi only for new pdf viewer
...
old pdf viewer will continue to use the main ouput.pdf file
2015-03-02 14:59:53 +00:00
Brian Gough
0315954b47
Merge branch 'master' into support-cached-pdfs
2015-03-02 09:20:00 +00:00
Brian Gough
5b9f2e8fc1
pass build id through to clsi when requesting pdf
2015-02-26 16:21:44 +00:00
Henry Oswald
161f24ffdf
add flag which requires login for /learn
2015-02-24 22:07:36 +00:00
Henry Oswald
8638b531a5
fire off register to newsletter on user registration as it can be slow
2015-02-23 16:03:45 +00:00
Henry Oswald
c33956c0af
fix jade warnings about missing space, need to escape the module html
...
insertions a different way. != func rather than !{func}
2015-02-23 10:18:48 +00:00
Henry Oswald
4eed88c1ab
broken a err and null check into 2 lines
2015-02-19 10:54:28 +00:00
Henry Oswald
a9660a3a07
add err and null project test for locating project element
2015-02-18 21:57:21 +00:00
Henry Oswald
f8e3fa6308
increase the auto compile limit a little
2015-02-18 21:57:21 +00:00
Henry Oswald
21a01d94d4
check that content exists before adding it to getAllDocs.
...
causing error which I think is blowing up the mongo driver elsewhere
2015-02-18 21:57:21 +00:00
James Allen
000f01fbeb
Remove unneeded uid module
2015-02-17 11:21:50 +00:00
James Allen
8e13ded360
Regenerate the session id after logging in or registering
2015-02-13 11:18:17 +00:00
Henry Oswald
65859468de
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-12 09:21:48 +00:00
Henry Oswald
216c9cefe3
don't error on subscription dashboard page if there is no subscription.taxRate
2015-02-12 09:21:45 +00:00
James Allen
50048a53b5
Don't throw an exception if there is an error with unzip
2015-02-11 11:34:49 +00:00
James Allen
e4b77a2563
Merge branch 'dropbox-module'
2015-02-10 11:38:32 +00:00
James Allen
001a5d751b
Pull out templates logic into its own module
2015-02-10 11:24:34 +00:00
Henry Oswald
7030d5f822
change plan shows price including tax
2015-02-06 16:19:52 +00:00
Henry Oswald
86f963a7ec
recurly tax updates
...
- get all accounts does get all of them by looping through all pages
- creating coupons requires which plan the coupon is for
- fixed the total price shown to people so it includes tax
2015-02-06 16:19:52 +00:00
James Allen
6c387edbe2
Remove Dropbox front end logic from main sharelatex repo
2015-02-05 18:20:34 +00:00
James Allen
d7afb4e513
Clean up unused real-time code in web
2015-02-05 16:37:37 +00:00
James Allen
5a922e2356
Include email address explicitly in welcome email to avoid any confusion
2015-02-05 12:52:50 +00:00
James Allen
e35d80211e
Log when rate limit is hit
2015-02-05 09:52:40 +00:00
Henry Oswald
7fdb8009a0
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-04 20:20:16 +00:00
Henry Oswald
e4a54cbdfc
added recurly subscription null checks
...
this deals with a user who has an expired old subscription then
is added to a group subscription.
2015-02-04 20:17:55 +00:00
James Allen
4235c90623
Add in rate limit to opening projets
2015-02-04 15:05:35 +00:00
James Allen
860de1528f
Load default coupon code if provided in query string
2015-02-02 17:42:27 +00:00
Henry Oswald
ee83ed6e81
started using underscore.string to check domain emails
2015-02-02 11:15:04 +00:00
Henry Oswald
0a64c1c8ac
on register try and auto allocate a group licence if one exists
2015-01-27 18:22:51 +00:00
Henry Oswald
3360b3c35a
added basic domain allocation feature
2015-01-27 18:09:56 +00:00
Brian Gough
58750140f4
enable new pdf viewer by default for newly created users
2015-01-21 15:26:01 +00:00
Henry Oswald
00810eaf21
Merge branch 'recurlyv3'
2015-01-19 13:51:02 +00:00
Henry Oswald
17fe30ca0f
sanitise the ref for universities site. and remove unneeded sanitise
2015-01-19 10:49:40 +00:00
Henry Oswald
4bcc9fb5c9
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-01-07 16:51:15 +00:00
Henry Oswald
7ec0264fe2
added missing currency symbols to subscription formatter
2015-01-07 16:51:05 +00:00
James Allen
923fbfc574
Correctly handle quote characters in template name when downloading
2015-01-07 13:16:38 +00:00
Henry Oswald
f9843b3709
tax auto updates on change of address now. Is also preset based on users ip address
2015-01-07 13:16:19 +00:00
Henry Oswald
aaaf28f916
added some helper methods into recurly wrapper which can be used by
...
our one time scripts
2015-01-07 12:02:07 +00:00
Henry Oswald
7e64b88fcf
fix cancel subscription on delete user
2015-01-02 10:37:59 +00:00
Henry Oswald
baa0a42825
coupon field is shown if query string scf is shown
2014-12-28 17:51:36 +00:00
Henry Oswald
a7eb836c79
redirect to /thank-you on success and fix broken unit test from a few commits ago
2014-12-22 16:37:09 +00:00
Henry Oswald
5305cbfd3e
got more correct details making it to recurly and improved form.
2014-12-19 11:17:35 +00:00
Henry Oswald
cc545db17b
can add account just about into recurly
2014-12-18 18:59:29 +00:00
Brian Gough
79b560f96b
update tests for new pdf viewer server fixes
2014-12-16 09:44:25 +00:00
Brian Gough
660bb75df4
add query string parameters for compileGroup= and pdfng=
...
compileGroup will bypass mongo check for compileGroup priority
pdfng will pass pdf Range: headers through from user request to CLSI
2014-12-12 16:47:43 +00:00
Brian Gough
fbf9111d80
Revert "revert to original CLSI proxy call"
...
This reverts commit 99b1b0d6598562b6346921504d1d1d37efe3be86.
2014-12-12 15:43:36 +00:00
Henry Oswald
0561adde4b
added more logging
2014-12-12 12:21:14 +00:00
Henry Oswald
bd77d0e020
add null check in on project
2014-12-12 10:27:14 +00:00
Henry Oswald
5c7d77a853
added logging around docstore setting
2014-12-11 16:22:00 +00:00
Brian Gough
8a77d619a8
revert to original CLSI proxy call
...
due to problems with cost of authentication when byte-serving
2014-12-11 13:15:13 +00:00
Brian Gough
265ad4439c
Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng
2014-12-05 14:43:01 +00:00
Brian Gough
a4ddfd5725
whitelist proxied headers when requesting pdfs from clsi
2014-12-03 15:09:46 +00:00
Brian Gough
138170be60
pass headers through when proxying request to allow for byte-range/etag handling
2014-12-02 14:53:46 +00:00
James Allen
c70c048aae
Send clear cache requests to the correct CLSI group
2014-12-01 12:19:01 +00:00
James Allen
e0178b17b5
Pass compile group correctly to Clsi._buildRequest
2014-12-01 10:28:09 +00:00
Henry Oswald
a570d05132
fixed bug with setting root doc which would fail if the document class isn't on the top line
2014-12-01 01:07:03 +00:00
James Allen
175dfae085
Look up compile group and features from project owner, not current user
2014-11-28 14:26:21 +00:00
Henry Oswald
20a5ad6e27
fixed where project to large code is passed from
2014-11-27 16:22:39 +00:00
Henry Oswald
fa755c6521
added project to long check from clsi2 (bit of a punt)
2014-11-27 15:42:37 +00:00
Henry Oswald
0bc76b6d92
mkdir p changed so it does not get entire project, now without doc lines
2014-11-27 12:07:49 +00:00
Henry Oswald
63deb0a508
Revert "added lock to update merger"
...
This reverts commit 8cdac1d74fd63d6ef83ce1e60ba41b9195ed0cac.
2014-11-27 11:46:17 +00:00
Henry Oswald
280895bdf5
added lock to update merger
2014-11-27 10:46:52 +00:00
Henry Oswald
ca8a21c425
change async to series
...
no real gain from parallel, series might reduce the cpu load if it finds the doc early
2014-11-26 21:53:57 +00:00
Henry Oswald
5e570d52a0
modfied setRootDocAutomatically to work async
...
was causing cpu to block for along time on big projects
2014-11-26 17:19:21 +00:00
Henry Oswald
857d867191
added locks into editor controller for new/move/deletes
...
filesystem import manager uses the unlocked version
2014-11-26 15:32:23 +00:00
Henry Oswald
dbecadcaea
Merge branch 'master' into multicurrency
2014-11-25 11:35:59 +00:00
Henry Oswald
6c0f03e9c7
added ab test to show collar plan to people in editor
2014-11-24 16:21:03 +00:00
James Allen
b8fdbdb406
Handle errors in request pipes
2014-11-24 13:58:41 +00:00
James Allen
970125b7a8
Check for null project in joinProject
2014-11-24 13:43:08 +00:00
James Allen
3578e41c9c
Add null check into FileTypeManager isDirectory check
2014-11-24 13:39:07 +00:00
James Allen
d4af0fe36d
Wrap smoke test in domain to catch errors
2014-11-24 13:36:10 +00:00
Henry Oswald
6c746d9aec
added redis health check in
2014-11-19 23:18:20 +00:00
Henry Oswald
cd8c233c05
Revert robust redis connection code
2014-11-19 15:06:05 +00:00
James Allen
8b9a26d6f3
Add in http health check end points for redis subscription channels
2014-11-19 14:12:37 +00:00
James Allen
d6532c63f8
Use new robust subscription model
2014-11-19 11:09:42 +00:00
Henry Oswald
804bc16bc8
redirect users to /register when coming from templates or share url
...
redirect to /login when going anywhere else (/project /project/1234)
2014-11-13 17:12:39 +00:00
Henry Oswald
f5d3801bfb
changed findElementByPath to not call cb more than once & deal with nulls
2014-11-11 14:44:44 +00:00
Henry Oswald
ae897cb41d
try catch encodeURIComponent
2014-11-10 16:30:02 +00:00
Henry Oswald
c920874872
added null check to compile features
2014-11-10 11:26:40 +00:00
Henry Oswald
29ae816432
added next into controller for error
2014-11-10 11:23:07 +00:00
Henry Oswald
e9232eb197
try catch converting id to object id
2014-11-09 23:08:23 +00:00
James Allen
84c08edcf3
Factor out common joinProject logic to provide and HTTP end point for the real-time API
2014-11-07 12:31:47 +00:00
James Allen
218f5fedf8
Fix broken template creation route
2014-11-07 11:21:55 +00:00
James Allen
9c5ae5adf4
Remove unused old update method
2014-11-07 09:39:17 +00:00
James Allen
d27af25bc9
Convert template publishing to use HTTP end points
2014-11-06 14:39:40 +00:00
James Allen
7b6ec86cef
Access Dropbox status via HTTP end points
2014-11-06 14:39:40 +00:00
James Allen
e596b60af0
Move collaborator HTTP end points into the Collaborators feature
2014-11-06 14:39:40 +00:00
James Allen
5c3e8e6d88
Add and remove collaborators with HTTP requests, not websockets
2014-11-06 14:39:40 +00:00
Henry Oswald
b9dd2d826e
added null check on subscription for group plans
2014-11-04 10:53:03 +00:00
Henry Oswald
edf715919d
send user to 404 if templates returns 404
2014-11-03 11:48:56 +00:00
Henry Oswald
4c7293f8c2
remove lang from page title in wiki article
2014-11-03 11:48:43 +00:00
Henry Oswald
30100f2a07
fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync
2014-10-31 12:41:06 +00:00
Henry Oswald
aeb956c8a4
wiki will try and get spanish version of page then fall back to english if it is not there
2014-10-31 12:15:03 +00:00
Henry Oswald
e0aae65050
added file ref null check
2014-10-31 10:50:20 +00:00
Henry Oswald
d428e7e5b4
handle a null in the file refs list
...
this seems to happen now and then when there is networking issues
2014-10-31 10:34:21 +00:00
Henry Oswald
56efefd6d4
renamed variable
2014-10-30 08:33:18 +00:00
James Allen
ca664e0063
Get subscription status correctly for showing upgrade/bonus link
2014-10-27 15:00:46 +00:00
James Allen
f1ddff4061
Only ignore hidden files from Dropbox, not GitHub
2014-10-27 14:39:20 +00:00
Henry Oswald
011bdc4617
explicitly set the file types to delete
...
the wild card version can get mixed up with app.del '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents
2014-10-24 12:01:52 +01:00
Henry Oswald
0a123418ac
insert ref data into uni page
2014-10-23 14:13:40 +01:00
Henry Oswald
8097e6ad71
made 7 day free trial the default
2014-10-21 13:48:46 +01:00
Henry Oswald
4bd0708029
put the compile group on the session so proxied requests are sent to the correct place
...
I know this is premature optimisation however we do make a lot of requests
to the clsi for each compile and this will save mongo a lot of calls
2014-10-21 09:34:58 +01:00
Henry Oswald
fb53be7ce4
Revert "priority compiles are proxyed to the priority servers"
...
This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.
2014-10-21 09:16:23 +01:00
Henry Oswald
250606472d
priority compiles are proxyed to the priority servers
2014-10-20 17:48:00 +01:00
Henry Oswald
9be31a2ac1
removed type: from log lines
2014-10-20 14:24:39 +01:00
Henry Oswald
3cf64ce34f
pass new compile features to client side, don't show timeout upgrade for premium users
2014-10-20 12:21:40 +01:00
Henry Oswald
b9d6d5bbf1
set the request timeout to a few mins for the compile
2014-10-17 13:23:29 +01:00
Henry Oswald
e7906f7018
timeout option passed to clsi
2014-10-16 18:43:48 +01:00
Henry Oswald
7293ccf06d
if user has premium compile send them to a different server set
2014-10-16 17:52:21 +01:00
Henry Oswald
5a4a90924b
added default opts for users compile features
2014-10-16 16:57:51 +01:00
Henry Oswald
1506f86a5f
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-16 16:34:25 +01:00
Henry Oswald
d97e42a959
get users features for compile options i.e. timeout and which compiler
2014-10-16 16:34:21 +01:00
James Allen
8fa8a64c6f
Update email templates
2014-10-16 12:46:38 +01:00
James Allen
f3a1ba93a4
Fix argument signature of mergeUpdate and deleteUpdate
2014-10-16 11:43:54 +01:00
James Allen
46ecaf9f6c
Fix broken argument signature of addFolder
2014-10-16 11:27:10 +01:00
James Allen
9f1a7c7396
Send source of update to doc updater and allow external updates to be ignored in UI
2014-10-16 11:27:10 +01:00
James Allen
7e9318814d
Send source of update to doc updater on setDocument request
2014-10-15 15:36:08 +01:00
James Allen
6800c1a15e
Track the source of updates through the system on adding/updating of docs and files
2014-10-15 15:18:31 +01:00
James Allen
4f2ab51ebd
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-10-15 14:11:11 +01:00
James Allen
941f550d6c
Remove all traces of soa-req-id
2014-10-15 14:11:02 +01:00