Commit graph

1704 commits

Author SHA1 Message Date
James Allen
01cf220d57 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2015-02-10 11:38: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
James Allen
2875958363 Merge pull request #140 from metbosch/fix/124_scroll_large_images
Allowed scroll on binary-file container
2015-02-09 13:32:57 +00:00
Brian Gough
353e9c86a8 sample only 1% of pdf exceptions due to volume of requests to sentry 2015-02-09 11:18:46 +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
6f5b524b56 use currency for change plan pricing 2015-02-06 17:08:42 +00:00
Henry Oswald
79e7f82a36 only setup recurly once for subscription dashboard and apply async to make sure updates on pricing are applied 2015-02-06 16:54:11 +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
ae3175c805 Show cookies error message on forbidden response 2015-02-05 12:57:44 +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
Henry Oswald
42d8f1f222 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-02-03 14:10:27 +00:00
James Allen
753a80ada5 Navigate away from deleted docs. Closes #141 2015-02-03 13:51:56 +00:00
James Allen
0d299b308e Ignore generated sharejs.js lib 2015-02-03 12:58:26 +00:00
James Allen
bd8311e1cf Merge pull request #146 from sharelatex/fix-pdfng-no-background-digests
Fix pdfng no background digests
2015-02-03 12:11:46 +00:00
Henry Oswald
e9ab77351a Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-02-03 11:36:16 +00:00
James Allen
2aa229d145 Add in profiling end point 2015-02-03 11:05:23 +00:00
Henry Oswald
e4976539d9 show generic error handler only on error 2015-02-03 10:41:58 +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
49e13128a0 forgot new moment lib 2015-01-30 10:13:32 +00:00
Henry Oswald
69b5eaad19 fixed the classic "UI Layout Callback Error" 2015-01-29 19:23: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
36513f443c Ensure we are in a digest loop when updating validation errors 2015-01-29 14:43:38 +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
69c3f48c1e if there is a validation error re enable the button 2015-01-29 13:56:19 +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
a13e78e853 catch rejected promises in pdfviewer 2015-01-26 16:07:49 +00:00
Brian Gough
b4f527b099 handle rejected promises in pdf viewer 2015-01-26 16:07:49 +00:00
Brian Gough
182dfabbae fix pdf loadcount (no ?: operator in coffeescript) 2015-01-26 16:07:49 +00:00
Brian Gough
1a8438be5f handle error loading pdf 2015-01-26 16:07:49 +00:00
Brian Gough
d9a3776183 make sure the progress bar always goes to 100% before removing 2015-01-26 16:07:49 +00:00
Brian Gough
5a47b1bac2 use .25-second delay before loading indicator is removed 2015-01-26 16:07:49 +00:00
Brian Gough
940c6a4b8d replace console.logs with error callbacks 2015-01-26 16:07:48 +00:00
Brian Gough
a5900c4b9a handle case where Raven is not defined in pdf renderer 2015-01-26 16:07:48 +00:00
Brian Gough
192918dda1 replace $timeout by setTimeout in pdf viewer 2015-01-26 16:07:48 +00:00
Brian Gough
63fd1f7c78 remove comments 2015-01-26 16:07:48 +00:00
Brian Gough
20d1a8b0f7 queue all pdf rescale/relayout events to avoid duplicate redraws
delay spinner by 100ms, since it now shows sooner
2015-01-26 16:07:48 +00:00
Brian Gough
866de306d6 added comment about double resize event 2015-01-26 16:07:48 +00:00
Brian Gough
3d1fe22f00 remove layout-ready event from pdfjs, we get it from jq layout 2015-01-26 16:07:48 +00:00
Brian Gough
bd8cfb1dae fix pdf viewer to work without background scope.apply 2015-01-26 16:07:48 +00:00
Brian Gough
1160560bfb add missing scope.$apply in pdf viewer event handlers
shows up now there are no apply's coming from the unsaved file check
2015-01-26 16:07:48 +00:00
Brian Gough
994b307e3f added comment for background polling change 2015-01-26 16:06:50 +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
5050c8c023 optimise common case for highlights (triggered on mousemove) 2015-01-26 15:14:55 +00:00
Brian Gough
5244fddce2 optimise common case for closing context menu (triggered on scroll) 2015-01-26 15:04:30 +00:00
Brian Gough
e62a2c7a6f only set watch on attrs.layoutDisabled when attribute is defined 2015-01-26 15:04:30 +00:00
Brian Gough
0453c657da prevent $scope.$apply from firing on every unsaved files check
only trigger a digest when there is a change in the saved state
2015-01-22 17:00:56 +00:00
Brian Gough
b407fde6e3 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2015-01-21 15:26:38 +00:00
Brian Gough
58750140f4 enable new pdf viewer by default for newly created users 2015-01-21 15:26:01 +00:00
Brian Gough
e66cd6dc58 Merge pull request #142 from sharelatex/pdfng-scrollhandler
Pdfng scrollhandler performance improvements
2015-01-21 15:25:29 +00:00
Brian Gough
4ab0f00b8d do not render offscreen pdf pages yet
they cause a delay without a visible spinner
2015-01-21 14:37:59 +00:00
Brian
f510c5d19f render current page immediately 2015-01-20 21:33:49 +00:00
Brian
62d5916883 replace $timeout by setTimeout in pdf viewer update 2015-01-20 21:06:53 +00:00
Brian
ed6eedd9e2 remove unused functions in pdfRenderer 2015-01-20 20:36:43 +00:00
Brian
c8012dc22c fix getVisiblePages in pdf viewer to allow optimisation 2015-01-20 20:35:29 +00:00
Brian Gough
debc3037ae remove debugging from pdf viewer 2015-01-20 16:22:34 +00:00
Brian Gough
441bc63935 use setTimeout instead of $timeout in pdf scrollhandler 2015-01-20 16:20:38 +00:00
Brian Gough
591498a056 fix dom position calculation in pdf viewer 2015-01-20 16:20:19 +00:00
Brian
53e9086094 remove useless scope.$apply in pdf scrollhandler 2015-01-20 15:37:11 +00:00
Brian
721843695b avoid using jquery in pdf scrollhandler to improve peformance 2015-01-20 15:36:52 +00:00
Brian Gough
96af4e0b4a fix selection of prerender pages in pdf viewer 2015-01-20 14:28:43 +00:00
Brian Gough
f18f862be2 handle different page size in pdf viewer 2015-01-20 14:28:14 +00:00
Brian Gough
c9e019b4a7 clean up calculation of visible pdf pages and display on redraw 2015-01-20 11:06:40 +00:00
metbosch
43d723bcfb Allowed scroll on binary-file container
Set overflow in auto mode to allow large images.
2015-01-19 23:34:49 +01:00
Henry Oswald
90bb12db40 added state to payment form 2015-01-19 20:27:01 +00:00
Brian Gough
776535f9f3 move pdf page visibility calculation up into pdfViewer directive
removes per-page watch for visibility
2015-01-19 16:55:44 +00:00
Henry Oswald
208dfea5c8 pull right the total prices on the payment page 2015-01-19 15:35:05 +00:00
Brian Gough
2e021b64d8 remove per-page $watch on default page size in pdf viewer 2015-01-19 14:36:20 +00:00
Brian Gough
906c9114cd replace per-page pdf highlight $watch with highlight event 2015-01-19 14:26:14 +00:00
Brian Gough
adab8c6769 delay pdf spinner by 100ms 2015-01-19 14:24:52 +00:00
Henry Oswald
00810eaf21 Merge branch 'recurlyv3' 2015-01-19 13:51:02 +00:00
Henry Oswald
08000f647d Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-01-19 10:49:45 +00:00
Henry Oswald
17fe30ca0f sanitise the ref for universities site. and remove unneeded sanitise 2015-01-19 10:49:40 +00:00
Brian
06330e6506 add pdfng scroll handler using requestAnimationFrame 2015-01-16 15:51:22 +00:00
Brian Gough
4e31833131 Merge pull request #138 from sharelatex/pdfng-use-browser-fonts
use font-face for pdfjs rendering
2015-01-16 14:31:37 +00:00
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
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