Henry Oswald
|
0bc76b6d92
|
mkdir p changed so it does not get entire project, now without doc lines
|
2014-11-27 12:07:49 +00:00 |
|
Henry Oswald
|
63deb0a508
|
Revert "added lock to update merger"
This reverts commit 8cdac1d74fd63d6ef83ce1e60ba41b9195ed0cac.
|
2014-11-27 11:46:17 +00:00 |
|
Henry Oswald
|
280895bdf5
|
added lock to update merger
|
2014-11-27 10:46:52 +00:00 |
|
Henry Oswald
|
5e570d52a0
|
modfied setRootDocAutomatically to work async
was causing cpu to block for along time on big projects
|
2014-11-26 17:19:21 +00:00 |
|
Henry Oswald
|
393a637673
|
remove a couple of required coffee-scritps which are not required
|
2014-11-26 15:37:53 +00:00 |
|
Henry Oswald
|
857d867191
|
added locks into editor controller for new/move/deletes
filesystem import manager uses the unlocked version
|
2014-11-26 15:32:23 +00:00 |
|
Henry Oswald
|
bd841b4795
|
coppied the lock manager over from doc updater
|
2014-11-25 16:52:27 +00:00 |
|
Henry Oswald
|
3bae278c92
|
Revert "increased timeout for geoip to 3 seconds"
This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.
|
2014-11-25 13:10:00 +00:00 |
|
Henry Oswald
|
d91064a369
|
increased timeout for geoip to 3 seconds
|
2014-11-25 11:51:03 +00:00 |
|
James Allen
|
afca9ba0cb
|
Fix unit tests
|
2014-11-24 14:26:51 +00:00 |
|
Henry Oswald
|
cd8c233c05
|
Revert robust redis connection code
|
2014-11-19 15:06:05 +00:00 |
|
James Allen
|
8b9a26d6f3
|
Add in http health check end points for redis subscription channels
|
2014-11-19 14:12:37 +00:00 |
|
James Allen
|
d6532c63f8
|
Use new robust subscription model
|
2014-11-19 11:09:42 +00:00 |
|
Henry Oswald
|
804bc16bc8
|
redirect users to /register when coming from templates or share url
redirect to /login when going anywhere else (/project /project/1234)
|
2014-11-13 17:12:39 +00:00 |
|
Henry Oswald
|
f5d3801bfb
|
changed findElementByPath to not call cb more than once & deal with nulls
|
2014-11-11 14:44:44 +00:00 |
|
James Allen
|
6d10e45135
|
Fix unit test
|
2014-11-07 12:35:10 +00:00 |
|
James Allen
|
84c08edcf3
|
Factor out common joinProject logic to provide and HTTP end point for the real-time API
|
2014-11-07 12:31:47 +00:00 |
|
James Allen
|
d27af25bc9
|
Convert template publishing to use HTTP end points
|
2014-11-06 14:39:40 +00:00 |
|
James Allen
|
7b6ec86cef
|
Access Dropbox status via HTTP end points
|
2014-11-06 14:39:40 +00:00 |
|
James Allen
|
e596b60af0
|
Move collaborator HTTP end points into the Collaborators feature
|
2014-11-06 14:39:40 +00:00 |
|
James Allen
|
5c3e8e6d88
|
Add and remove collaborators with HTTP requests, not websockets
|
2014-11-06 14:39:40 +00:00 |
|
Henry Oswald
|
1a2411d4c2
|
removed bad require in test causing redis to be required in unit test #shouldhavebeenabountyhunter
|
2014-11-06 12:07:50 +00:00 |
|
Henry Oswald
|
30100f2a07
|
fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync
|
2014-10-31 12:41:06 +00:00 |
|
James Allen
|
f1ddff4061
|
Only ignore hidden files from Dropbox, not GitHub
|
2014-10-27 14:39:20 +00:00 |
|
Henry Oswald
|
4bd0708029
|
put the compile group on the session so proxied requests are sent to the correct place
I know this is premature optimisation however we do make a lot of requests
to the clsi for each compile and this will save mongo a lot of calls
|
2014-10-21 09:34:58 +01:00 |
|
Henry Oswald
|
fb53be7ce4
|
Revert "priority compiles are proxyed to the priority servers"
This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.
|
2014-10-21 09:16:23 +01:00 |
|
Henry Oswald
|
250606472d
|
priority compiles are proxyed to the priority servers
|
2014-10-20 17:48:00 +01:00 |
|
Henry Oswald
|
3cf64ce34f
|
pass new compile features to client side, don't show timeout upgrade for premium users
|
2014-10-20 12:21:40 +01:00 |
|
Henry Oswald
|
b9d6d5bbf1
|
set the request timeout to a few mins for the compile
|
2014-10-17 13:23:29 +01:00 |
|
Henry Oswald
|
e7906f7018
|
timeout option passed to clsi
|
2014-10-16 18:43:48 +01:00 |
|
Henry Oswald
|
7293ccf06d
|
if user has premium compile send them to a different server set
|
2014-10-16 17:52:21 +01:00 |
|
Henry Oswald
|
1506f86a5f
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-10-16 16:34:25 +01:00 |
|
Henry Oswald
|
d97e42a959
|
get users features for compile options i.e. timeout and which compiler
|
2014-10-16 16:34:21 +01:00 |
|
Henry Oswald
|
d8cc3b7b61
|
fixed leaky test
|
2014-10-16 16:02:31 +01:00 |
|
James Allen
|
f3a1ba93a4
|
Fix argument signature of mergeUpdate and deleteUpdate
|
2014-10-16 11:43:54 +01:00 |
|
James Allen
|
46ecaf9f6c
|
Fix broken argument signature of addFolder
|
2014-10-16 11:27:10 +01:00 |
|
James Allen
|
9f1a7c7396
|
Send source of update to doc updater and allow external updates to be ignored in UI
|
2014-10-16 11:27:10 +01:00 |
|
James Allen
|
7e9318814d
|
Send source of update to doc updater on setDocument request
|
2014-10-15 15:36:08 +01:00 |
|
James Allen
|
6800c1a15e
|
Track the source of updates through the system on adding/updating of docs and files
|
2014-10-15 15:18:31 +01:00 |
|
James Allen
|
941f550d6c
|
Remove all traces of soa-req-id
|
2014-10-15 14:11:02 +01:00 |
|
Henry Oswald
|
19a08f82a6
|
default to USD if there is no match
|
2014-10-14 12:14:03 +01:00 |
|
Henry Oswald
|
4a774981cf
|
Merge branch 'master' into multicurrency
|
2014-10-14 11:52:03 +01:00 |
|
Henry Oswald
|
3bac4dc39f
|
increase auto compile limit
|
2014-10-14 11:50:06 +01:00 |
|
Henry Oswald
|
6437f74cd3
|
use req.ip not x-forwarded-for to get ip address for multi currency
|
2014-10-13 17:55:18 +01:00 |
|
Henry Oswald
|
5a0d74753f
|
plans page will auto redirect to best guess currency
|
2014-10-13 17:39:44 +01:00 |
|
Henry Oswald
|
7964616f02
|
changing email address should lowercase the email
|
2014-10-13 15:44:45 +01:00 |
|
Henry Oswald
|
36264706f6
|
hooked the plans page up to the geo ip lookup
|
2014-10-13 14:10:15 +01:00 |
|
Henry Oswald
|
3ca04e25fd
|
add 1 second timeout to geoiplookup
response times generally seem to be around 0.05s from our servers
|
2014-10-13 13:15:48 +01:00 |
|
Henry Oswald
|
2e6c2c1926
|
default to USD in geo ip lookup.
Decided to put default logic in the GeoIpLookup.getCurrencyCode as
we are going to want this default everywhere we use it.
|
2014-10-13 13:08:11 +01:00 |
|
Henry Oswald
|
e78e4d46b0
|
use first ip passed though in string for ip lookup
|
2014-10-13 13:04:20 +01:00 |
|