Henry Oswald
|
a52b91691a
|
Merge branch 'master' into multicurrency
|
2014-11-21 13:16:29 +00:00 |
|
Henry Oswald
|
6d22bda88f
|
added new currencies removed ab test as well
|
2014-11-21 13:13:53 +00:00 |
|
Henry Oswald
|
6c746d9aec
|
added redis health check in
|
2014-11-19 23:18:20 +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 |
|
Henry Oswald
|
ae897cb41d
|
try catch encodeURIComponent
|
2014-11-10 16:30:02 +00:00 |
|
Henry Oswald
|
c920874872
|
added null check to compile features
|
2014-11-10 11:26:40 +00:00 |
|
Henry Oswald
|
29ae816432
|
added next into controller for error
|
2014-11-10 11:23:07 +00:00 |
|
Henry Oswald
|
e077108993
|
null check user in logging
|
2014-11-10 11:21:59 +00:00 |
|
Henry Oswald
|
e9232eb197
|
try catch converting id to object id
|
2014-11-09 23:08:23 +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
|
218f5fedf8
|
Fix broken template creation route
|
2014-11-07 11:21:55 +00:00 |
|
James Allen
|
9c5ae5adf4
|
Remove unused old update method
|
2014-11-07 09:39:17 +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 |
|
James Allen
|
94a17bd36d
|
Remove unused socket.io endpoints
|
2014-11-06 14:39:40 +00:00 |
|
Henry Oswald
|
b9dd2d826e
|
added null check on subscription for group plans
|
2014-11-04 10:53:03 +00:00 |
|
Henry Oswald
|
16e93b6f1b
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-11-03 12:07:53 +00:00 |
|
Henry Oswald
|
edf715919d
|
send user to 404 if templates returns 404
|
2014-11-03 11:48:56 +00:00 |
|
Henry Oswald
|
4c7293f8c2
|
remove lang from page title in wiki article
|
2014-11-03 11:48:43 +00:00 |
|
James Allen
|
528ff743e8
|
Remove github feature flat
|
2014-11-03 10:55:35 +00:00 |
|
Henry Oswald
|
30100f2a07
|
fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync
|
2014-10-31 12:41:06 +00:00 |
|
Henry Oswald
|
aeb956c8a4
|
wiki will try and get spanish version of page then fall back to english if it is not there
|
2014-10-31 12:15:03 +00:00 |
|
Henry Oswald
|
e0aae65050
|
added file ref null check
|
2014-10-31 10:50:20 +00:00 |
|
Henry Oswald
|
0f4d9771aa
|
added null check to where we insert elements into a project
|
2014-10-31 10:37:44 +00:00 |
|
Henry Oswald
|
d428e7e5b4
|
handle a null in the file refs list
this seems to happen now and then when there is networking issues
|
2014-10-31 10:34:21 +00:00 |
|
Henry Oswald
|
56efefd6d4
|
renamed variable
|
2014-10-30 08:33:18 +00:00 |
|
James Allen
|
ca664e0063
|
Get subscription status correctly for showing upgrade/bonus link
|
2014-10-27 15:00:46 +00:00 |
|
James Allen
|
f1ddff4061
|
Only ignore hidden files from Dropbox, not GitHub
|
2014-10-27 14:39:20 +00:00 |
|
Henry Oswald
|
011bdc4617
|
explicitly set the file types to delete
the wild card version can get mixed up with app.del '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents
|
2014-10-24 12:01:52 +01:00 |
|
Henry Oswald
|
0a123418ac
|
insert ref data into uni page
|
2014-10-23 14:13:40 +01:00 |
|
Henry Oswald
|
8097e6ad71
|
made 7 day free trial the default
|
2014-10-21 13:48:46 +01: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
|
9be31a2ac1
|
removed type: from log lines
|
2014-10-20 14:24:39 +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
|
5a4a90924b
|
added default opts for users compile features
|
2014-10-16 16:57:51 +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 |
|
James Allen
|
8fa8a64c6f
|
Update email templates
|
2014-10-16 12:46:38 +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
|
4f2ab51ebd
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex
|
2014-10-15 14:11:11 +01:00 |
|
James Allen
|
941f550d6c
|
Remove all traces of soa-req-id
|
2014-10-15 14:11:02 +01:00 |
|
Henry Oswald
|
af769c7871
|
allow ip to set via query string for plans page
|
2014-10-15 11:58:35 +01:00 |
|
James Allen
|
b32375530c
|
Refactor card css for use in new subscription page
|
2014-10-14 15:46:44 +01:00 |
|
Henry Oswald
|
b2b13ef9a7
|
pass plan to payment page to get the number of collaborators
|
2014-10-14 12:14:24 +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
|
2538d16e63
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-10-14 11:50:10 +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
|
2bf34bba4d
|
added currency to subscription view model
|
2014-10-13 16:14:13 +01:00 |
|
James Allen
|
3c058edfb4
|
Add github feature flag to user model
|
2014-10-13 15:45:19 +01:00 |
|
Henry Oswald
|
7964616f02
|
changing email address should lowercase the email
|
2014-10-13 15:44:45 +01:00 |
|
James Allen
|
5edefe2498
|
Add in compile timeout and group feature options
|
2014-10-13 15:42:11 +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
|
40c3c3e1ce
|
added customAccount to subscription model
|
2014-10-10 15:57:27 +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 |
|
Henry Oswald
|
9924882b59
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-10-09 16:45:26 +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 |
|
Henry Oswald
|
c2c29bb282
|
university site renders via prozy ok
|
2014-10-08 16:07:44 +01:00 |
|
James Allen
|
82dc3cf654
|
Don't reload module views each request by default
|
2014-10-08 12:39:36 +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
|
10732d112d
|
Hook module system into project list page
|
2014-10-03 11:32:59 +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
|
81307324fc
|
v2, seems to work...
|
2014-09-26 17:04:33 +01:00 |
|
Henry Oswald
|
f73629f8d9
|
v1 of sentinal support
|
2014-09-26 14:52:00 +01:00 |
|
Henry Oswald
|
2376d0a188
|
added generic error logging
|
2014-09-18 14:37:23 +01:00 |
|
Henry Oswald
|
9c98e95ca4
|
send cancelation email after 1 hour
|
2014-09-16 14:25:12 +01:00 |
|
Henry Oswald
|
6efda9cf1c
|
push currency default to seperate var
|
2014-09-11 11:45:00 +01:00 |
|
Henry Oswald
|
20f0c648e5
|
default to USD
|
2014-09-11 11:35:39 +01:00 |
|
Henry Oswald
|
1b02dc72a3
|
destroy session on dropbox webhook
|
2014-09-10 14:19:44 +01:00 |
|
Henry Oswald
|
c08a568664
|
removed session logging
|
2014-09-10 10:09:25 +01:00 |
|
Henry Oswald
|
d961b48857
|
imporved logging for session debug
|
2014-09-10 08:20:36 +01:00 |
|