James Allen
893ff85521
Don't allow password resets for holding accounts
2015-04-14 13:11:49 +01:00
James Allen
33f56b71a2
Remove redundant body parser line
2015-04-14 13:04:49 +01:00
James Allen
8b4ccae60a
Read cookie session length from settings file
2015-04-14 13:04:29 +01:00
Brian Gough
0684fa36fd
upgrade pdfjs to version 1.0.1040
2015-03-31 14:53:27 +01:00
James Allen
8483f249ee
Actually proxy websocket connections
2015-03-20 19:08:48 +00:00
Brian Gough
b0a32b1ef8
make new pdf viewer the default for all users
...
remove old pdf viewer
2015-03-20 11:28:28 +00:00
James Allen
ff55e4c5ed
Merge branch 'private_registration'
2015-03-20 10:34:17 +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
d76ef86077
Tell user to contact admin email to register
2015-03-18 16:20:26 +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
Brian Gough
adb98d05b5
sentry 1.1.16 does not yet support release parameter, use build tag instead
2015-03-18 15:50:26 +00:00
Brian Gough
5d788ca7c5
add grunt version target to report version to sentry
...
it writes the git commit id and Jenkins build number into the sentry
configuration
2015-03-17 16:59:17 +00:00
Oliver Skånberg-Tippen
5df9f49a4e
Rename 'javscript' to 'javascript'
2015-03-10 18:56:46 +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
James Allen
bb61dfe34a
Show nice error page if socket.io could not be loaded
2015-03-09 13:57:13 +00:00
James Allen
d376acdaa9
Allow an __appName__ parameter in translations
2015-03-09 12:14:30 +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
9805c6a9ff
doc model no longer has lines or rev in it
2015-03-04 11:10:59 +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
edc83b905c
remove circular references when reporting to sentry
2015-03-03 16:41:21 +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
40b30b957a
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-24 22:07:43 +00:00
Henry Oswald
161f24ffdf
add flag which requires login for /learn
2015-02-24 22:07:36 +00:00
Henry Oswald
387a8b8ae3
hide some forms in user settings if authentication is managed by external system
2015-02-24 13:41:46 +00:00
Henry Oswald
5028665913
ignore errors from https://pstatic.datafastguru.info its malware we have
...
no control over
2015-02-23 17:29:38 +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
e4121d8a28
forgot comma in ignoreUrls
2015-02-19 11:25:06 +00:00
Henry Oswald
4eed88c1ab
broken a err and null check into 2 lines
2015-02-19 10:54:28 +00:00
Henry Oswald
ad5de0e93a
added null check on Facebook
2015-02-18 22:25:58 +00:00
Henry Oswald
5d09999da5
ignore errors from twitter loading
2015-02-18 22:19:49 +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
455d78773e
change the meta tags a little to help with so
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
766bfbf5ef
Provide easy way out of track-changes
2015-02-18 17:50:14 +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
Henry Oswald
bf38fb7459
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-10 18:05:51 +00:00
Henry Oswald
1d6c928c81
fix bug which showed all plans as monthly in payment form.
...
Also use translations for string of month/year
2015-02-10 18:05:39 +00:00
James Allen
b44e9b1dcb
Move template front end code to module
2015-02-10 13:02:43 +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
08420a305a
autolink chat messages
2015-02-07 16:15:33 +00:00
Henry Oswald
7918ea4bc3
don't evaulate wiki/learn html with angular
2015-02-07 15:55:27 +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
f75376124e
Update open source branding
2015-02-05 16:56:35 +00:00
James Allen
d7afb4e513
Clean up unused real-time code in web
2015-02-05 16:37:37 +00:00
James Allen
3aad31069c
Always show chat name or email
2015-02-05 13:05:57 +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
888ebd5d7b
Attempt to stop superfish malware from loading
2015-02-05 11:23:45 +00:00
James Allen
366a0403a6
Clear rate limit in smoke tests
2015-02-05 10:18:18 +00:00
James Allen
e35d80211e
Log when rate limit is hit
2015-02-05 09:52:40 +00:00
Henry Oswald
993c5bcee7
dont show generic error message on subscriptions if they are part of a group
2015-02-04 20:56:50 +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
2aa229d145
Add in profiling end point
2015-02-03 11:05:23 +00:00
James Allen
860de1528f
Load default coupon code if provided in query string
2015-02-02 17:42:27 +00:00
James Allen
48a17729e4
Show change plan list on clicking change plan, not hide
2015-02-02 14:53:45 +00:00
Henry Oswald
7f0b4e5ba5
Merge branch 'master' into sitelicences
2015-02-02 11:15:14 +00:00
Henry Oswald
ee83ed6e81
started using underscore.string to check domain emails
2015-02-02 11:15:04 +00:00
Henry Oswald
cb889efb6a
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-01-29 18:32:26 +00:00
Henry Oswald
948eeb87ba
improved momentjs
...
- access it via amd not global
- remove warning message
- updated 2.7.0 -> 2.9.0
2015-01-29 18:31:11 +00:00
Henry Oswald
5a15e826a7
moved mathjax to be served locally
2015-01-29 18:29:53 +00:00
James Allen
3731c62e17
Get validation working with address fields and Angular digest loop
2015-01-29 14:22:57 +00:00
James Allen
2a78a7843a
Allow subscriptions with no free plans, and adjust styles
2015-01-29 14:11:25 +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
Henry Oswald
bebe94a128
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-01-26 15:38:34 +00:00
Henry Oswald
b06c9f509e
if chat errors don't keep trying to get more chat messages
...
causes loop which is why we have so many sentury errors
2015-01-26 15:36:34 +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
90bb12db40
added state to payment form
2015-01-19 20:27:01 +00:00
Henry Oswald
208dfea5c8
pull right the total prices on the payment page
2015-01-19 15:35:05 +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
Henry Oswald
7508ba6c47
improved validation so that fields recurly said are wrong get highlighted
2015-01-07 16:43:20 +00:00
Henry Oswald
f6e9c544e6
slightly improved the breakdown form. Still not very pretty.
2015-01-07 14:59:56 +00:00
Henry Oswald
5d6a96ba4f
made form thinner
2015-01-07 14:51:54 +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
d678af4417
only validate credit card an cvv if there is data in them
2014-12-28 22:19:15 +00:00
Henry Oswald
735dd0811c
changed credit card/paypal logs from offical ones to font very good ones
...
upgraded fontamerican to 4.2
2014-12-28 22:14:39 +00:00
Henry Oswald
1716b16fb0
added placeholder info to address
2014-12-28 22:03:12 +00:00
Henry Oswald
afab06bcac
removed safe message from payment form.
2014-12-28 21:56:17 +00:00
Henry Oswald
1a4825a47b
pulled total price down a little
2014-12-28 19:08:36 +00:00
Henry Oswald
0efb1bba5b
adjusted post code and country field sizes
2014-12-28 19:06:01 +00:00
Henry Oswald
2d03e0532f
adjusted style of payment options
2014-12-28 19:04:47 +00:00
Henry Oswald
40aeed74ce
added little ssl secure message
2014-12-28 18:55:29 +00:00
Henry Oswald
bd52594f23
added new official paypal logo from https://www.paypal.com/uk/webapps/mpp/logo-center
2014-12-28 18:43:53 +00:00
Henry Oswald
673140b620
got new credit card logos from https://www.mastercardbrandcenter.com/us/getourbrand/index.shtml?pageId=dl_0340&expertVisible=false
2014-12-28 18:35:44 +00:00
Henry Oswald
9d57288809
centered the billing forms
2014-12-28 18:23:08 +00:00
Henry Oswald
236d4d7ab3
made the fields smaller and pushed plan name to header
2014-12-28 18:16:55 +00:00
Henry Oswald
137b9c1077
removed some labels and added paypal/credit card logos
2014-12-28 17:59:29 +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
7f979e77db
- fixed new payment page so it uses correct plan and currency
...
- submit button is disabled while processing
- removed test data
2014-12-28 17:16:21 +00:00
Henry Oswald
ecb71d5bbf
pull recurely pub api key from settings file
2014-12-23 12:08:01 +00:00
Henry Oswald
12a28d91f2
removed month names
2014-12-23 12:00:41 +00:00
Henry Oswald
74347611e9
don't show the form until we have some data from recurly
2014-12-23 11:44:42 +00:00
Henry Oswald
03311311dd
added translations in
2014-12-23 11:42:56 +00:00
Henry Oswald
e2819c3bc6
added generic error handling to recurly processing and required fields
2014-12-23 11:04:54 +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
d0c9783718
added paypal option in, not tested as we don't have paypal in stag
2014-12-22 15:51:50 +00:00
Henry Oswald
fb0a083b36
added address 2
2014-12-22 15:19:40 +00:00
Henry Oswald
6cedfb19d9
cleaned up form and added basic validation
2014-12-22 15:07:55 +00:00
Henry Oswald
fa1ec44e22
coupons work
2014-12-22 14:06:39 +00:00
Henry Oswald
a47b25d4b2
works with multi plan and currency, auto updates view on change
2014-12-22 12:55:29 +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
Henry Oswald
47fb2a0878
basic angular form which has data bound to it
2014-12-18 17:48:23 +00:00
Brian Gough
505675803b
increase sentry sample rate to 100%
2014-12-18 09:31:38 +00:00
Brian Gough
7429e7845d
add sentry exclusion list and set logging sample rate to 1%
2014-12-16 11:34:48 +00:00
James Allen
2a2dc458e8
Merge pull request #127 from sharelatex/pdfng-server-fixes
...
pdfng server fixes
2014-12-16 10:30:22 +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
James Allen
b260287965
Merge pull request #125 from sharelatex/clientside-error-logging
...
Clientside error logging
2014-12-12 15:54:23 +00:00
Brian Gough
fbf9111d80
Revert "revert to original CLSI proxy call"
...
This reverts commit 99b1b0d6598562b6346921504d1d1d37efe3be86.
2014-12-12 15:43:36 +00:00
Brian Gough
419d84564c
add support for client-side error logging using sentry
2014-12-12 13:58:07 +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
b388c587e5
remove debugging log for pdf featureswitch
2014-12-04 16:42:28 +00:00
Brian Gough
a4ddfd5725
whitelist proxied headers when requesting pdfs from clsi
2014-12-03 15:09:46 +00:00
James Allen
4020c2f760
Update wrong synctex tooltip
2014-12-03 11:01:41 +00:00
James Allen
31ee8eea8b
Show sync panel for everyone except anonymous users
2014-12-03 10:09:40 +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
Brian Gough
ce8b5dd11c
generate fingerprints for the new pdf.js files
2014-12-01 16:48:40 +00:00
Brian Gough
5053536fff
load the compatibility library from the correct version of pdf.js
2014-12-01 15:41:17 +00:00
Brian Gough
25bebe1104
support old and new pdf viewers depending on feature switch
2014-12-01 14:35:12 +00:00
James Allen
c70c048aae
Send clear cache requests to the correct CLSI group
2014-12-01 12:19:01 +00:00
Brian Gough
3fd8bfb221
make the pdf viewer directive conditional depending on user feature switch
2014-12-01 11:47:56 +00:00
James Allen
e0178b17b5
Pass compile group correctly to Clsi._buildRequest
2014-12-01 10:28:09 +00:00
Brian Gough
175de30967
Merge branch 'master' into pdfng
2014-12-01 10:09:04 +00:00