Henry Oswald
05dedeebb8
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-06-29 15:36:53 +01:00
Henry Oswald
000c862ae1
return 404 if blog returns 403, caused by file not existing
2016-06-29 15:36:33 +01:00
Shane Kilkelly
03fedafaf5
save the session key string, rather than just the id
2016-06-29 15:12:12 +01:00
Paulo Reis
536c1ac65e
Merge branch 'pr-project-filepath-regex'
2016-06-29 14:19:37 +01:00
Paulo Reis
36e09e3b0c
Make the user id portion of the path optional.
2016-06-29 14:19:16 +01:00
Brian Gough
16b58a9420
Merge pull request #268 from sharelatex/per-user-containers-part-3
...
add support for on-demand viewing of pdfs for per-user compiles
2016-06-29 14:16:24 +01:00
James Allen
fde334acc4
Create script that will ensure data is migrate between redis backends
2016-06-29 12:57:56 +01:00
Paulo Reis
72d498c6c8
Merge branch 'master' into pr-contact-form-suggestions
2016-06-29 11:58:07 +01:00
Paulo Reis
f50c73642a
Integrate with KB index.
2016-06-29 11:57:43 +01:00
Shane Kilkelly
db213c0621
Begin keeping record of user sessions in reds.
2016-06-29 11:35:25 +01:00
Paulo Reis
d037cb93a9
Wiki styles clean-up.
2016-06-29 10:42:51 +01:00
Paulo Reis
5ad0c06770
Regex now matches new folder nomenclature.
2016-06-28 17:19:02 +01:00
Henry Oswald
d58ebb2dd4
added custom footer for email option
2016-06-28 17:08:00 +01:00
Henry Oswald
8f14526354
added custom footer in email option
2016-06-28 17:07:27 +01:00
Henry Oswald
88fb955884
hook notifications handler up to make request which doesn't make request if url not set
2016-06-28 16:52:27 +01:00
James Allen
dbe03e2757
Track metrics of when backends match or disagree
2016-06-28 16:49:15 +01:00
Paulo Reis
a6d184358f
Avoid inline-styles.
2016-06-28 15:51:50 +01:00
Paulo Reis
88564ea126
Dynamically determine if the files dropdown should drop up or drop down.
2016-06-28 15:48:11 +01:00
James Allen
0b9e85ea50
Update ioredis version
2016-06-28 15:47:06 +01:00
Shane Kilkelly
9e16f250f9
Merge branch 'sk-subscription-address'
2016-06-28 14:16:34 +01:00
Shane Kilkelly
6581bc4ecf
set postal_code as zip
2016-06-28 14:15:47 +01:00
Shane Kilkelly
465d09dcfe
Test the createSubscription action (+4 squashed commits)
...
Squashed commits:
[fc9c8f9] Add tests for createBillingInfo
[db9f90e] Test the createSubscription stage
[c17151d] Check that userExists gets set
[1367c96] Act on buddy-check feedback
2016-06-28 13:59:52 +01:00
Paulo Reis
4263d3f8c6
Merge branch 'master' into pr-overflowing-images-wiki
2016-06-28 11:58:58 +01:00
Paulo Reis
86a8a180a8
Merge branch 'master' into pr-toggle-comment-keybinding-windows
2016-06-28 11:37:46 +01:00
Brian Gough
e0d262a6d8
fix shrinkwrap file
2016-06-28 11:18:20 +01:00
Paulo Reis
616fd5daf6
Merge branch 'master' into pr-ui-feedback-error-nav
2016-06-28 10:50:23 +01:00
Paulo Reis
d6067b86ac
Merge branch 'master' into pr-ui-feedback-error-nav
2016-06-28 10:49:55 +01:00
Brian Gough
2b23e13619
Merge pull request #261 from sharelatex/use-parameter-for-bcrypt-rounds
...
use parameter for bcrypt rounds, rehash passwords on login if necessary
2016-06-28 10:49:33 +01:00
Brian Gough
afc89d8d27
added missing package grunt-execute
2016-06-28 10:42:36 +01:00
Brian Gough
6e187e3996
added npm shrinkwrap file
2016-06-28 10:42:36 +01:00
James Allen
883a9b512a
Merge pull request #265 from MCribbin/patch-1
...
Update HumanReadableLogsRules.coffee
2016-06-28 10:33:24 +01:00
Shane Kilkelly
e194de50cf
test _paypal.checAccountExists
.
2016-06-28 10:17:06 +01:00
Henry Oswald
b8b833b753
moved wiki into module
2016-06-28 10:16:02 +01:00
Paulo Reis
da960a721f
Vertical layout for LaTeX examples.
2016-06-28 10:09:12 +01:00
Henry Oswald
5786162e09
added learn wiki option and parse helper method
2016-06-28 10:07:50 +01:00
Brian Gough
03188d2a57
only keep a single cached output directory in per-user containers
2016-06-28 09:28:40 +01:00
Shane Kilkelly
6bdfedc1b0
Test when a paypal stage produces an error
2016-06-28 09:09:57 +01:00
Shane Kilkelly
d21eb1b07f
Add tests
2016-06-28 09:04:19 +01:00
Brian Gough
8d32fa1e87
enable per-user containers by default
2016-06-28 08:40:30 +01:00
Shane Kilkelly
709f8f2bea
start testing the paypal workflow.
2016-06-27 16:34:00 +01:00
Paulo Reis
6a8499f515
Merge branch 'master' into pr-toggle-comment-keybinding-windows
2016-06-27 15:39:35 +01:00
Paulo Reis
3580d8377f
Merge branch 'master' into pr-contact-form-suggestions
2016-06-27 15:39:00 +01:00
Paulo Reis
d7f67e7931
Integrate translations.
2016-06-27 15:38:13 +01:00
Henry Oswald
926e6fee41
don't try and put properties on email if basic email is not configured
2016-06-27 15:19:43 +01:00
ShareLaTeX
2d8f594ffb
Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image
2016-06-27 13:52:31 +00:00
Henry Oswald
4a81192f70
added SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH and SHARELATEX_EMAIL_SMTP_IGNORE_TLS
2016-06-27 14:50:46 +01:00
Paulo Reis
0551f27c83
Extra search options; only search after three chars have been entered.
2016-06-27 14:46:34 +01:00
Shane Kilkelly
3bf8da3e83
test _createCreditCardSubscription
2016-06-27 14:45:17 +01:00
Shane Kilkelly
2c1b326681
test the createSubscription
function.
2016-06-27 14:29:19 +01:00
Shane Kilkelly
95d85538cc
Clean up xml text block in test.
2016-06-27 14:00:30 +01:00