Commit graph

1720 commits

Author SHA1 Message Date
Brian Gough
751166d987 Merge branch 'master' into fix-pdfng-progress-bar
Conflicts:
	public/coffee/ide/pdfng/directives/pdfRenderer.coffee
	public/coffee/ide/pdfng/directives/pdfViewer.coffee
2015-01-16 14:19:59 +00:00
Brian Gough
df9cb03dcc Merge pull request #134 from sharelatex/pdfng-reload-on-error
Pdfng reload on error
2015-01-16 14:18:17 +00:00
Brian Gough
d832406923 pdfng: add comment about getDestinations vs getDestination 2015-01-16 12:50:08 +00:00
Henry Oswald
a0f5c09cb9 remove raven source map line 2015-01-15 15:22:45 +00:00
Henry Oswald
f2bc98bc3c Change debuging to stringify messages in exception message 2015-01-15 15:18:15 +00:00
Brian Gough
157424c7b6 use font-face for pdfjs rendering 2015-01-13 16:39:49 +00:00
Brian Gough
8d568d9663 increase pdfng page load/render timeouts to 1 minute 2015-01-13 16:38:40 +00:00
Brian Gough
5e06043fcb add loadedCallback to pdfng, detects when pdf is fully loaded 2015-01-13 16:28:24 +00:00
Brian Gough
953821959d hide progress bar when pdfng has loaded 2015-01-13 16:27:04 +00:00
Brian Gough
1d3d316595 capture all pdfng error callbacks with raven 2015-01-13 15:47:27 +00:00
Brian Gough
823bdcf583 fix scope error in pdf viewer 2015-01-12 17:03:03 +00:00
Brian Gough
887423f8d7 report timeout errors to sentry 2015-01-12 17:02:51 +00:00
Brian Gough
560919b78f avoid exception in pdf viewer
if file was previously bigger, current position could be greater than
the number of pages
2015-01-12 16:47:38 +00:00
Brian Gough
bf8bc27de0 catch errors in pdf viewer and reload if necessary
if more than 3 reloads, display error to the user
2015-01-12 16:46:17 +00:00
Brian Gough
7f750ae692 add an error callback to the pdf renderer
use page load and render timeouts of 30 seconds to detect hanging pages
2015-01-12 16:45:24 +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
dd5562f9b6 Send more data to sentry about messages.reverse error 2015-01-07 13:16:38 +00:00
James Allen
10653c12fd Send more data to Sentry to track down error 2015-01-07 13:16:38 +00:00
James Allen
923fbfc574 Correctly handle quote characters in template name when downloading 2015-01-07 13:16:38 +00:00
James Allen
aec80fb1db Include FreeTrialModalControler in main.coffee 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
474fa5fe19 only validate expiry when both are set 2014-12-28 21:53:12 +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