Commit Graph

45 Commits

Author SHA1 Message Date
Henry Oswald 43102e0ffc lowercase and trim add user to group email address 2016-02-25 14:15:56 +00:00
Henry Oswald b504732733 fixed calls to addUserToGroup and added more logging 2016-02-22 16:50:41 +00:00
Henry Oswald 29e4b324fd improve calls for invite notifications and auto mark as read 2016-02-18 11:43:43 +00:00
Henry Oswald f824a3e28a kill off dead code in group handler 2016-02-18 11:42:26 +00:00
Henry Oswald 7994528c92 make site licence regex more specific 2016-02-03 16:08:29 +00: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 3ecf201eda send -> sendStatus 2015-07-08 16:56:38 +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 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 f709ddf3eb add csv export unit tests 2015-05-28 17:22:49 -03:00
Henry Oswald b657c5207e cleaned up the views a bit 2015-05-27 21:45:29 +01: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
Brian Gough cc9c8fdc94 freeze Date in Recurly tests before all calls
beforeEach freezes and resets for each subtest, which does not give
the desired result as the time increases between each subtest, we want
to freeze once at the beginning and reset at the end using before/after.
2015-05-19 15:00:30 +01:00
James Allen 6c387edbe2 Remove Dropbox front end logic from main sharelatex repo 2015-02-05 18:20:34 +00:00
Henry Oswald 3360b3c35a added basic domain allocation feature 2015-01-27 18:09:56 +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 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 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 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 558b6cdfde remove test which isn't really that important 2014-09-18 14:41:30 +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 416f41e59d stopped using proper settings inside of a test 2014-08-29 13:06:50 +01:00
Henry Oswald aa83b5ca5d fixed tests whoops 2014-08-29 12:41:42 +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
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 d047d44079 Changed the error messages which are sent down to the client to be translated first
fixed up tests from titles we check when rendering, deleted them as they never
catch anything important, more hastle than they are worth imo.
2014-08-01 14:03:38 +01:00
Henry Oswald c0a6f0b7ad Merge branch 'master-redesign' into master-redesign-templates-and-blog
Conflicts:
	public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
	public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
	public/coffee/ide/online-users/OnlineUsersManager.coffee
	public/coffee/ide/track-changes/directives/infiniteScroll.coffee
2014-07-10 15:15:18 +01:00
James Allen 2553f51e44 Remove unused subscription downgrade logic 2014-07-08 12:55:29 +01:00
Henry Oswald 8670b543b9 added basic chat handler 2014-07-02 17:28:05 +01:00
Henry Oswald ca1539cac0 added timefreeze to recurly wrapper, don't think it really works but never know *double shurg* 2014-05-15 22:21:49 +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 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