github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
9381 commits 3 branches 7 tags 199 MiB
Commit graph

9381 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Henry Oswald
f55ef2f1b4 made what is returned for multi currency more explicit 2014-10-13 16:13:31 +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
7b37bed2cd Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-10 15:45:09 +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
James Allen
a8afe3a0d7 Improve file uploader CSS 2014-10-10 13:40:00 +01:00
Henry Oswald
c7a3cb87c2 added modules folder 2014-10-10 09:50:53 +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
bc94ea56cb Add projects to tag after creating the tag 2014-10-09 08:39:15 +01:00
James Allen
3bf7948510 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-10-08 17:18:57 +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
1f5d7ee6a8 Merge pull request #116 from mickaobrien/keyboard-shortcuts 
Added keyboard shortcuts to bold and italicise text
 2014-10-08 16:56:03 +01:00
James Allen
7258fadd17 Improve styling of plan name and price on subscription form 2014-10-08 16:52:37 +01:00
Mick O'Brien
834e27f3c5 Fix indentation in italics shortcut 2014-10-08 16:34:44 +01:00
James Allen
696e8d24e1 Fix z index of more updates buttons 2014-10-08 16:32:42 +01:00
Mick O'Brien
b7db72e574 Replace $isEmpty check 2014-10-08 16:17:38 +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
Mick O'Brien
72fc630e81 Added keyboard shortcuts to bold and italicise text 2014-10-08 15:44:01 +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