Commit graph

17856 commits

Author SHA1 Message Date
James Allen
b44e9b1dcb Move template front end code to module 2015-02-10 13:02:43 +00:00
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
5f7b2bb802 Merge pull request #2 from dwrensha/request-dep
'request' is a production dependency
2015-02-10 10:14:18 +00:00
David Renshaw
f72fa9de34 'request' is a production dependency 2015-02-09 17:34:01 -05:00
Brian Gough
7fdce8fc48 split pack handling code into separate parts for docs and projects
need to debug projects
2015-02-09 16:53:44 +00:00
Brian Gough
d8dc56b031 don't try to getLastCompressedUpdates from packs 2015-02-09 16:53:05 +00:00
James Allen
820b6ad4e8 Add missing file 2015-02-09 16:27:44 +00:00
James Allen
906919a86f Don't rely on --net=host 2015-02-09 16:18:58 +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
James Allen
97ea2b6aa1 Initial Dockerfile image build 2015-02-06 17:01:50 +00:00
Brian Gough
f50f091fc6 added comments 2015-02-06 16:59:09 +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
Brian Gough
e47476369a clean up docHistory pack decoding 2015-02-06 15:04:46 +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
Brian Gough
8e810bab14 report error for inconsistent history results 2015-02-05 16:37:06 +00:00
Brian Gough
715b0df4a1 prototype for expanding packs 2015-02-05 16:36:41 +00:00
James Allen
79cd0e6a5c Record user id correctly when updating position 2015-02-05 13:41:31 +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
Henry Oswald
a0832c79e6 return 404 if doc is deleted and include_deleted is not set to true 2015-02-03 14:05:08 +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