github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-30 14:25:01 -05:00
Code Issues Projects Releases Packages Wiki Activity
7073 commits 3 branches 7 tags 206 MiB
Commit graph

233 commits

Author SHA1 Message Date
Henry Oswald
47eebb1840 add null check and default empty object for subscirption dashboard 2016-02-03 17:41:05 +00:00
Henry Oswald
7994528c92 make site licence regex more specific 2016-02-03 16:08:29 +00:00
Henry Oswald
aafdeb031e wip - downgrade options it all works, need unit tests & translations 2015-12-08 18:23:28 +00:00
Henry Oswald
ba58509a67 increased length rate limit is in effect for 2015-11-16 12:21:06 +00:00
James Allen
16b7bf222a Merge branch 'contacts' 2015-11-05 10:14:25 +00:00
Henry Oswald
885915916a check if user exists on recurly callback 2015-10-21 11:27:13 +01:00
Henry Oswald
2b8dd7248a added subscription handler null check 2015-10-19 22:29:11 +01:00
James Allen
d996ed6e47 Refactor addUserToProject for better access by groups 2015-10-14 17:29:58 +01:00
Henry Oswald
fae7d431f4 after subscription is updated always check bonus 2015-10-05 16:33:13 +01:00
Henry Oswald
c12213b46b added logging around load editor times 2015-07-22 10:38:28 +01:00
Henry Oswald
3ecf201eda send -> sendStatus 2015-07-08 16:56:38 +01:00
Henry Oswald
1cc0cbe8fc split site into 2 routers, webRouter and apiRouter 
web router has things like sessions etc added onto it. Api router is minimal, doesn't include things like csrf
 2015-07-01 15:23:18 +01:00
Henry Oswald
665bdcf538 v1 of express4 conversion 2015-07-01 15:17:43 +01:00
Henry Oswald
33aa5c732f if a domain licence link has expired render a nice message explaining they need to retry 2015-06-01 12:43:42 +01:00
Henry Oswald
cb48242b74 changed email expire to 1 day for verifying account 2015-06-01 12:22:46 +01:00
Henry Oswald
d3f6c0c614 Merge branch 'user-csv' of git://github.com/heukirne/web-sharelatex into heukirne-user-csv 2015-05-29 12:17:54 +01:00
Henrique Dias
f50eb0398f add export csv group feature 2015-05-28 16:54:41 -03:00
Henry Oswald
22b94e9246 renamed SubscriptionDomainAllocator -> SubscriptionDomainHandler 2015-05-27 20:57:54 +01:00
Henry Oswald
4773d6d22f added tests around new endpoints for joining groups 2015-05-27 20:50:16 +01:00
Henry Oswald
f27c072ae1 pull logic checking if user is already part of a group out of controller into handler 2015-05-27 16:33:47 +01:00
Henry Oswald
72e528e9d1 if you are alread in the group show the custom group page 2015-05-27 15:50:28 +01:00
Henry Oswald
79fa49a43d if a user is elelable to be part of a group subscription and they go to 
/user/subscription it should redirect them to the group subscription invite
 2015-05-27 15:35:31 +01:00
Henry Oswald
481bd67fbd changed paths to use hyphens and add succesfull join page 2015-05-26 15:26:45 +01:00
Henry Oswald
841231dbf8 make PasswordResetTokenHandler generic so it can be used for invites 2015-05-26 15:24:09 +01:00
Henry Oswald
cad8d8a23b v1 basic invite works, not pretty or tested 2015-05-22 13:57:15 +01:00
Henry Oswald
97f0fad525 add vat number option to payment form 2015-03-04 18:08:06 +00:00
Henry Oswald
80dc2f9224 send coupon code server side to be applied to users subscription 2015-03-04 17:50:24 +00:00
Henry Oswald
161f24ffdf add flag which requires login for /learn 2015-02-24 22:07:36 +00:00
Henry Oswald
216c9cefe3 don't error on subscription dashboard page if there is no subscription.taxRate 2015-02-12 09:21:45 +00:00
James Allen
e4b77a2563 Merge branch 'dropbox-module' 2015-02-10 11:38:32 +00:00
Henry Oswald
7030d5f822 change plan shows price including tax 2015-02-06 16:19:52 +00:00
Henry Oswald
86f963a7ec recurly tax updates 
- get all accounts does get all of them by looping through all pages
- creating coupons requires which plan the coupon is for
- fixed the total price shown to people so it includes tax
 2015-02-06 16:19:52 +00:00
James Allen
6c387edbe2 Remove Dropbox front end logic from main sharelatex repo 2015-02-05 18:20:34 +00:00
Henry Oswald
e4a54cbdfc added recurly subscription null checks 
this deals with a user who has an expired old subscription then
is added to a group subscription.
 2015-02-04 20:17:55 +00:00
James Allen
860de1528f Load default coupon code if provided in query string 2015-02-02 17:42:27 +00:00
Henry Oswald
ee83ed6e81 started using underscore.string to check domain emails 2015-02-02 11:15:04 +00:00
Henry Oswald
3360b3c35a added basic domain allocation feature 2015-01-27 18:09:56 +00:00
Henry Oswald
00810eaf21 Merge branch 'recurlyv3' 2015-01-19 13:51:02 +00:00
Henry Oswald
7ec0264fe2 added missing currency symbols to subscription formatter 2015-01-07 16:51:05 +00:00
Henry Oswald
f9843b3709 tax auto updates on change of address now. Is also preset based on users ip address 2015-01-07 13:16:19 +00:00
Henry Oswald
aaaf28f916 added some helper methods into recurly wrapper which can be used by 
our one time scripts
 2015-01-07 12:02:07 +00:00
Henry Oswald
baa0a42825 coupon field is shown if query string scf is shown 2014-12-28 17:51:36 +00:00
Henry Oswald
a7eb836c79 redirect to /thank-you on success and fix broken unit test from a few commits ago 2014-12-22 16:37:09 +00:00
Henry Oswald
5305cbfd3e got more correct details making it to recurly and improved form. 2014-12-19 11:17:35 +00:00
Henry Oswald
cc545db17b can add account just about into recurly 2014-12-18 18:59:29 +00:00
Henry Oswald
6c0f03e9c7 added ab test to show collar plan to people in editor 2014-11-24 16:21:03 +00:00
Henry Oswald
b9dd2d826e added null check on subscription for group plans 2014-11-04 10:53:03 +00: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
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
Henry Oswald
36264706f6 hooked the plans page up to the geo ip lookup 2014-10-13 14:10:15 +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
e7984a90d7 unlink dropbox when a user cancels 2014-10-09 17:05:41 +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
93b4c5f4f8 thank you page displays the correct currency 2014-09-08 10:59:12 +01:00
Henry Oswald
aee0dda243 added currency to signiture 2014-09-08 10:36:30 +01:00
Henry Oswald
eeb27062a0 added currency query string param to subscribe button 2014-09-05 11:40:14 +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
Henry Oswald
350b95a0a5 annual upgrade page works, needs a bit of copy love now 2014-08-28 18:14:31 +01:00
Henry Oswald
f5618e9d9c added confirm you want to change plan modal 
added page and corisponding endpoint to migrate to annual plan
 2014-08-27 17:51:10 +01:00
Henry Oswald
27b9cad8ca make ga experiements per page 2014-08-24 17:07:40 +01:00
Henry Oswald
6c131b1084 - removed free trial on annual accounts 
- added setting val for google analytics experiments to be added in head
- added 14 day free trial variation to plans page
 2014-08-22 14:20:39 +01:00
James Allen
b367c4a968 Show group subscription status on subscription dashboard page 
Conflicts:
	app/views/subscriptions/dashboard.jade
 2014-08-07 15:51:43 +01:00
Henry Oswald
1b8c8b8c48 sorted out titles 2014-08-01 13:47:14 +01:00
James Allen
8c56a46594 Merge branch 'master' into master-redesign 2014-07-08 13:24:48 +01:00
James Allen
2553f51e44 Remove unused subscription downgrade logic 2014-07-08 12:55:29 +01:00
James Allen
452098ca68 Redirect to register if not registered on plans page 2014-07-07 14:05:07 +01:00
James Allen
7947eb28ad Remove ab test from plans page 2014-07-07 12:30:19 +01:00
Henry Oswald
430cf5cea8 created CollaboratorsHandler 2014-04-07 20:46:58 +01:00
Henry Oswald
615e05cb89 moved newsletter manager into its own feature 2014-04-04 15:47:27 +01:00
Henry Oswald
ba1371744b deal with users who may have been deleted but are still inside a subscription group 2014-03-25 16:19:30 +00:00
Henry Oswald
ea9ba59371 updated google anltyics experiment code 2014-03-24 22:24:09 +00:00
Henry Oswald
4988fc4136 setup second plans page with free trial using google analytics experiements 2014-03-21 17:49:20 +00:00
Henry Oswald
0e7d241fcf fixed has subscription check causing bad redirects 
subscription != recurlySubscription
 2014-03-08 19:01:00 +00:00
Henry Oswald
f2069c6208 converted all analytics to use new google analytics, removing mixpanel 
and heap. Not tracking subscriptions or cancelations yet.
 2014-03-08 19:00:26 +00:00
Henry Oswald
ffe690afa3 hooked up lifetime emails 2014-03-05 14:56:52 +00:00
James Allen
8715690ce9 Intial open source comment 2014-02-12 10:23:40 +00:00