Commit graph

21005 commits

Author SHA1 Message Date
James Allen
bb61dfe34a Show nice error page if socket.io could not be loaded 2015-03-09 13:57:13 +00:00
James Allen
d376acdaa9 Allow an __appName__ parameter in translations 2015-03-09 12:14:30 +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
1bd2404be1 remove whitespace before internal settings and add realtime config to settings.development.coffee.example 2015-03-05 18:06:06 +00:00
Winston Li
e6bdbe8f17 Fix the rest of the tests 2015-03-05 15:39:05 +00:00
Winston Li
5df8b2b65f Change 2 tests to launch git in separate process. 2015-03-05 15:21:28 +00:00
Henry Oswald
983f9bb870 Use nodejs 0.10.x 2015-03-04 22:42:11 +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
Brian Gough
a36d14f4cc fix caching of suggestions 2015-03-04 17:00:19 +00:00
Brian Gough
c549d29d8e test that Aspell is killed by timeout 2015-03-04 16:44:13 +00:00
Brian Gough
a49f80cb21 support Aspell worker pool 2015-03-04 16:43:59 +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
James Allen
536118b0cf Relay messages received via HTTP into the project 2015-03-03 17:15:19 +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
Henry Oswald
726afb6b90 use sendstatus not send 2015-03-03 15:20:05 +00:00
Henry Oswald
a7185c412c use res.sendStatus not re.send 2015-03-03 14:45:32 +00:00
Henry Oswald
5b0f69a50d added cache to learn words manager 2015-03-03 14:28:47 +00:00
Henry Oswald
536e014600 remove js tests 2015-03-03 14:27:55 +00:00
Henry Oswald
35254be989 fix up the aspell tests 2015-03-03 14:25:54 +00:00
Henry Oswald
72ce615641 added lru cache 2015-03-03 13:57:16 +00:00
Henry Oswald
3212866e82 increase json size to 2mb 2015-03-03 13:57:05 +00:00
Henry Oswald
c8ec6451ce removed the reset of restify 2015-03-03 08:10:47 +00:00
Henry Oswald
7bbce79ff6 convert app to use express not restifiy so it works with metrics-sharelatex 2015-03-02 18:13:28 +00:00
Brian Gough
876ea130b9 check the words in batches, to avoid blocking the event loop 2015-03-02 16:58:10 +00:00
Henry Oswald
86416775fc added flame graph 2015-03-02 15:49:12 +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
Henry Oswald
57d214e2dd fix metrics key name 2015-03-02 14:59:30 +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
416d7a17a7 Merge pull request #16 from sharelatex/cache-output-files
Keep output files in cache
2015-03-02 12:06:06 +00:00
Brian Gough
3a3eda0ccf reduce cache limit for pdfs 2015-03-02 11:31:48 +00:00
Brian Gough
c26de9554d skip cache directory error when empty 2015-03-02 09:58:20 +00:00
Brian Gough
0315954b47 Merge branch 'master' into support-cached-pdfs 2015-03-02 09:20:00 +00:00
Brian Gough
52baf4976e Merge branch 'master' into cache-output-files 2015-03-02 09:18:44 +00:00
Henry Oswald
9e91d31abb Merge branch 'doc-collection-only'
Conflicts:
	app/coffee/DocManager.coffee
2015-03-02 08:06:41 +00:00
Henry Oswald
bf3e568db9 add timeout for health check 2015-03-01 12:56:31 +00:00
Henry Oswald
1d98d45320 fix port for health check 2015-03-01 12:53:10 +00:00
Henry Oswald
48badde67a Merge branch 'master' of https://github.com/sharelatex/spelling-sharelatex 2015-03-01 12:48:13 +00:00
Henry Oswald
eb193c24ae added health check endpoint 2015-03-01 12:45:14 +00:00
Brian Gough
7f38c5e5a3 fix double callback for proc.on 'error' and proc.on 'close' 2015-02-27 16:07:02 +00:00
Brian Gough
140090da47 move convert tests from middleware to restricted static server 2015-02-27 15:38:57 +00:00
Henry Oswald
6c568d9cbb don't log out when doc lines are [] as this is a new empty doc 2015-02-27 15:19:08 +00:00
Henry Oswald
d59fb0d590 Merge branch 'master' into doc-collection-only
Conflicts:
	app/coffee/DocManager.coffee
2015-02-27 14:58:38 +00:00