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
|
1b893ff502
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
|
2014-10-15 16:22:01 +01:00 |
|
Henry Oswald
|
750b050358
|
added ab test in for multi currency
|
2014-10-15 16:21:45 +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 |
|
Henry Oswald
|
e443809206
|
free trial length is show correctly at bottom of plans page
|
2014-10-15 11:49:20 +01:00 |
|
James Allen
|
fd8991f62e
|
Sort out responsive flow
|
2014-10-15 10:23:08 +01:00 |
|
James Allen
|
64fe2a2404
|
Improve CSS and layout of feature list on new subscription page
|
2014-10-15 10:22:03 +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
|
3382c5bb17
|
added blurb to payment page
|
2014-10-13 17:51:59 +01:00 |
|
Henry Oswald
|
5a0d74753f
|
plans page will auto redirect to best guess currency
|
2014-10-13 17:39:44 +01:00 |
|
Henry Oswald
|
52c54e7300
|
added ability to change currency on payment page
|
2014-10-13 17:28:00 +01:00 |
|
Henry Oswald
|
58f6ae323b
|
fix which plan is "your plan" on dashboard
|
2014-10-13 16:33:01 +01:00 |
|
Henry Oswald
|
2bbdea3433
|
renamed change currency function and sorted out recommended currency
|
2014-10-13 16:27:27 +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 |
|
James Allen
|
cfb3969b88
|
Fix alignment in left menu
|
2014-10-13 14:45: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
|
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 |
|
Henry Oswald
|
9803f8bd70
|
changed uni page holder and footer
|
2014-10-09 16:45:04 +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
|
8f7dff1518
|
Don't show empty sync menu list for collaborators
|
2014-10-08 15:57:56 +01:00 |
|
James Allen
|
3a9d8c2b31
|
Make Dropbox unlinking consistent with github
|
2014-10-08 14:02:37 +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
|
e406034ad6
|
Add in Dropbox description
|
2014-10-07 14:42:03 +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 |
|