Commit graph

23625 commits

Author SHA1 Message Date
Winston Li
c36a1de7c3 pushFailsOnInvalidFiles integration test. 2015-03-10 11:49:31 +00:00
Winston Li
105ab215b2 Bye travis. 2015-03-10 00:33:41 +00:00
Winston Li
896b00d4ac Add local repo config setting for travis. 2015-03-10 00:26:48 +00:00
Winston Li
7e803bb950 pushFailsOnSecondStageOutOfDate integration test. 2015-03-10 00:19:12 +00:00
Winston Li
d1156cb812 Remove exit code assertion from push failing as it is undefined. 2015-03-10 00:13:15 +00:00
Winston Li
9245037abf pushFailsOnFirstStageOutOfDate integration test. 2015-03-09 23:56:16 +00:00
Winston Li
4781a78926 canPushFilesSuccessfully integration test. 2015-03-09 23:37:58 +00:00
Winston Li
8f416cfd60 canPullDeletedNestedFiles integration test. 2015-03-09 23:22:40 +00:00
Winston Li
1de56ef76b canPullAModifiedNestedFile integration test. 2015-03-09 23:15:27 +00:00
Winston Li
f0f5333161 canPullADeletedBinaryFile integration test. 2015-03-09 23:08:53 +00:00
Winston Li
5e8e042ad2 canPullAModifiedBinaryFile integration test. 2015-03-09 23:02:57 +00:00
Winston Li
60ca2f1788 canPullAModifiedTexFile integration test. 2015-03-09 22:55:00 +00:00
Winston Li
5a00c84359 Refactor with deletion and tests. 2015-03-09 22:41:55 +00:00
Winston Li
8993702f69 Initial large refactor. 2015-03-09 22:41:55 +00:00
Winston Li
79307923ad Allow null directories in directory deletion methods. 2015-03-09 22:35:40 +00:00
Winston Li
83db4e6a10 Joda-Time for ISO6801 timestamps. 2015-03-09 21:38:53 +00:00
Winston Li
e7c1b29008 Change timestamp parsing to include milliseconds. 2015-03-09 21:29:03 +00:00
Brian
10c3d3eb70 replace deprecated res.send(code) with res.sendStatus(code) 2015-03-09 15:56:49 +00:00
Brian
21c664b28c fix variable mismatch in error handler 2015-03-09 15:52:25 +00:00
James Allen
0f69ee0f22 Add in proxy for /socket.io so that we don't need to faff with real-time service location 2015-03-09 14:09:09 +00:00
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