Commit graph

679 commits

Author SHA1 Message Date
Brian Gough
3bdf2158c1 avoid exception on page size change 2015-03-19 14:26:06 +00:00
Brian Gough
6320fcccec remove underscore from pollSavingStatus
the underscore module is not loading in time for some users on MacOS
2015-03-19 14:22:22 +00:00
James Allen
bb61dfe34a Show nice error page if socket.io could not be loaded 2015-03-09 13:57:13 +00:00
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
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
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
5b9f2e8fc1 pass build id through to clsi when requesting pdf 2015-02-26 16:21:44 +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
c98c2db6be change Raven?.captureException to not log json, might be causing error 2015-02-23 17:27:35 +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
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
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
4c4aaac7a9 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-02-17 10:59:25 +00:00
Henry Oswald
c4b21f3184 added some null checks to message.user.id 2015-02-16 23:16:38 +00:00
Brian Gough
c29714f427 avoid unnecessary infinite scroll loadUntilFull calls
allow the dom to update before checking if more data is needed
2015-02-13 15:53:59 +00:00
James Allen
f037c466cd Quieten noisy Ace warnings 2015-02-12 12:17:21 +00:00
James Allen
18d627baba Add missing localStorage.coffee... oops 2015-02-12 11:55:52 +00:00
James Allen
7dd1ab84d5 Wrap calls to localStorage in an exception handler 2015-02-12 11:32:27 +00:00
Henry Oswald
bf38fb7459 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-02-10 18:05:51 +00:00
Henry Oswald
1d6c928c81 fix bug which showed all plans as monthly in payment form.
Also use translations for string of month/year
2015-02-10 18:05:39 +00:00
James Allen
bd5f303712 Remove dropbox js include 2015-02-10 14:05:51 +00:00
James Allen
b44e9b1dcb Move template front end code to module 2015-02-10 13:02:43 +00:00
James Allen
e4b77a2563 Merge branch 'dropbox-module' 2015-02-10 11:38:32 +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
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
James Allen
6c387edbe2 Remove Dropbox front end logic from main sharelatex repo 2015-02-05 18:20:34 +00:00
James Allen
d7afb4e513 Clean up unused real-time code in web 2015-02-05 16:37:37 +00:00
James Allen
ae3175c805 Show cookies error message on forbidden response 2015-02-05 12:57:44 +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
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
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