Commit graph

2384 commits

Author SHA1 Message Date
Brian Gough
b41cdb424b Merge branch 'master' of github.com:sharelatex/web-sharelatex
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-03-06 15:03:52 +00:00
Brian Gough
24b2844ece avoid race condition loading underscore
make underscore.coffee angular module depend on libs, which depends on
underscore-1.3.3

Have avoided adding an extra dependency on underscore itself so that
the version number is not duplicated.  We could have a single
definition of underscore in the requirejs config, to keep the version
number in one place.
2015-03-06 15:03: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
69806c02d0 improve behaviour of trying to rename a file to empty 2015-03-04 14:19:47 +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
8d092fc84d replace .filter with _.filter to remove dependency on ES5 2015-03-03 16:45:37 +00:00
Brian Gough
c52a122966 workaround for lack of DOM element .remove in IE 2015-03-03 16:44:26 +00:00
Brian Gough
edc83b905c remove circular references when reporting to sentry 2015-03-03 16:41:21 +00:00
Brian Gough
0ff5f54bf6 fix unit test for build parameter 2015-03-02 15:33:45 +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
c29329cb37 Merge pull request #156 from sharelatex/support-cached-pdfs
Support cached pdfs with build parameter
2015-03-02 13:48:37 +00:00
Brian Gough
7aea33b562 keep existing behaviour when loading other output files 2015-03-02 12:18:10 +00:00
Brian Gough
0315954b47 Merge branch 'master' into support-cached-pdfs 2015-03-02 09:20:00 +00:00
Brian Gough
caed778117 load output files from cached build when known 2015-02-26 16:47:47 +00:00
Brian Gough
a64b8724bd include the build parameter in the compile unit tests 2015-02-26 16:21:44 +00:00
Brian Gough
5b9f2e8fc1 pass build id through to clsi when requesting pdf 2015-02-26 16:21:44 +00:00
James Allen
c495e5c492 Release version 0.1.3 2015-02-26 11:48:42 +00:00
Henry Oswald
8100f988b2 comment out ldap in settings.defaults 2015-02-26 11:40:02 +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
3a9c6503ee null check mathjax 2015-02-23 17:46:17 +00:00
Henry Oswald
9a7f73ed89 null check response.outputFiles 2015-02-23 17:43:22 +00:00
Henry Oswald
4f11974c85 added null check when looking for deletedByExternalDataSource 2015-02-23 17:33:05 +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
c98c2db6be change Raven?.captureException to not log json, might be causing error 2015-02-23 17:27:35 +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
f7f681d2a3 deal with nan tax rate if user is not in taxable location for subscription dashboard/change plan 2015-02-22 18:35:59 +00:00
Henry Oswald
d112ad22a8 added ldapjs to package.json 2015-02-20 15:23:24 +00:00
Henry Oswald
6a3f760c6f added ShareLaTeX server pro options with ldap into settings.defaults 2015-02-20 12:09:35 +00:00
Henry Oswald
78b4bccba1 remove qq upload loading gif, just 404's atm and is not missed 2015-02-19 11:42:57 +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
67f4929e49 null check on loadRootFolder 2015-02-18 22:31:45 +00:00
Henry Oswald
e8b50e2ffd null check highlights before removing them 2015-02-18 22:29:07 +00:00
Henry Oswald
2c3b19e43d null check on deleting entry from scope 2015-02-18 22:28:02 +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
c15484db6b added null check on log entry files in the client 2015-02-18 22:16:29 +00:00
Henry Oswald
4ec05364bb set chat message to empty string by default 2015-02-18 22:06:18 +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
1a7d4f6be1 Fix smoke tests 2015-02-17 11:21:14 +00:00