Commit Graph

269 Commits

Author SHA1 Message Date
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
Henry Oswald 259871cbdd added geoip lookup feature 2014-10-13 00:45:45 +01:00
Henry Oswald b90003b11e added custom user dashboard page 2014-10-10 15:44:53 +01:00
Henry Oswald 3ba3a91043 if its a custom account redirect to /user/subscription/custom_account 2014-10-10 15:11:22 +01:00
Henry Oswald e5ab40c911 added example session invalidation code 2014-10-09 18:10:01 +01:00
Henry Oswald e7984a90d7 unlink dropbox when a user cancels 2014-10-09 17:05:41 +01:00
James Allen 4743b460f5 Only show rename or deleted message once 2014-10-09 09:13:38 +01:00
James Allen accd8207b2 Show password reset expired message rather than server error if that's what has happened 2014-10-08 17:18:24 +01:00
James Allen 128c672edd Merge branch 'github-sync'
Conflicts:
	package.json
2014-10-08 12:13:37 +01:00
James Allen dbd85a05f1 Send user features and features switches to views where needed 2014-10-07 13:31:13 +01:00
Henry Oswald 8789a4bde1 server rejects rename of entitys over 150 chars 2014-10-07 11:16:26 +01:00
Henry Oswald b01b05e49b server rejects project names over 150 chars 2014-10-07 11:14:02 +01:00
James Allen 6c7c09075c Treat paths properly in project content update methods 2014-10-03 11:33:18 +01:00
James Allen 13a96c925b Add in endpoints to allow updating project files when the project id is know 2014-10-02 14:15:30 +01:00
Henry Oswald 7f2df4bbd3 renamed rate limiter tests 2014-09-29 11:42:46 +01:00
Henry Oswald 0d056434e6 fixed tests 2014-09-26 17:49:31 +01:00
Henry Oswald 558b6cdfde remove test which isn't really that important 2014-09-18 14:41:30 +01:00
Henry Oswald 1b02dc72a3 destroy session on dropbox webhook 2014-09-10 14:19:44 +01:00
James Allen 971afb7342 Treat large text files as binary 2014-09-04 13:00:51 +01:00
Henry Oswald e740e4913d if user is already annual tell them so on the annual upgrade page 2014-08-29 14:13:05 +01:00