1245 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrew Brown	d2190ea67f	Show chart of which content types user can currently create/edit	2017-01-30 13:02:42 +00:00
Andrew Brown	0afa6f8e54	Fix tests not having billing plans to report	2017-01-27 21:50:54 +00:00
Andrew Brown	f38727dd55	Add icons to navbar dropdown on desktop	2017-01-27 21:34:35 +00:00
Andrew Brown	459fee484b	Add per-user email subscription preference and way to edit	2017-01-27 21:00:11 +00:00
Andrew Brown	cc30160655	Report new signups to Slack properly	2017-01-27 16:06:01 +00:00
Andrew Brown	8fec40536f	Merge branch 'authority' of github.com:indentlabs/notebook into authority	2017-01-27 16:01:10 +00:00
Andrew Brown	66ca8b8d31	Merge branch 'master' into authority	2017-01-27 15:10:39 +00:00
Andrew Brown	42c9ddf69b	Merge branch 'master' into authority	2017-01-25 19:18:00 +00:00
Andrew Brown	defba2249b	Tests for changing subscriptions and resulting permissions	2017-01-25 19:14:29 +00:00
Andrew Brown	863116d8e4	Don't create stripe customers in test env :(	2017-01-25 16:45:33 +00:00
Andrew Brown	2363a29b36	Start on subscription controller specs #wip	2017-01-24 19:14:50 +00:00
Andrew Brown	4b962808ec	Move billingplan initialization to rakefile to fix test initializations	2017-01-24 15:54:40 +00:00
Andrew Brown	8b1577c017	Minor verbiage	2017-01-24 15:20:32 +00:00
Andrew Brown	3f1a6faa14	Fix flow of payment info --> upgrade to actually upgrade	2017-01-24 15:12:15 +00:00
Andrew Brown	70136ce9cd	Don't require a payment method when switching back to Starter	2017-01-24 14:10:46 +00:00
Andrew Brown	8aa3cf7f4a	Allow deleting payment method, retains subscription until end_date	2017-01-24 13:46:08 +00:00
Andrew Brown	3d285b0b99	Handle failed card payments on upgrade	2017-01-24 13:45:43 +00:00
Andrew Brown	548f9acdd2	Allow users to modify/remove payment methods and view billing history	2017-01-24 00:02:48 +00:00
Andrew Brown	959731ac43	Ask for card info and allow switching between subscription tiers	2017-01-23 21:59:07 +00:00
Andrew Brown	1da55caaab	Make subscription page content based on current subscription for upgrade/downgrade	2017-01-23 16:34:12 +00:00
Andrew Brown	c6c34c5ac7	Rake task to add default stripe customers to all existing users	2017-01-23 15:33:49 +00:00
Andrew Brown	81b26c2505	Add stripe + initialize stripe customers on user create	2017-01-23 15:22:58 +00:00
Andrew Brown	22190f064f	Redesign profile page	2017-01-21 19:16:23 +00:00
Andrew Brown	7fe2a6eb8c	Fix privacy not being allowed to be modified on half the content #whoops	2017-01-21 19:16:11 +00:00
Andrew Brown	631f68164b	Load missing chartkick js on user profile page	2017-01-21 18:41:31 +00:00
Andrew Brown	6824edb427	Hide the site update card in the sidebar	2017-01-21 18:23:37 +00:00
Andrew Brown	432058c856	Don't show quick-add for universes	2017-01-21 18:18:44 +00:00
Andrew Brown	b5f4a3795f	Link 'create your first x' buttons on extended/collective content to subscription page	2017-01-21 18:13:16 +00:00
Andrew Brown	187e3d4a87	Link users to subscription page instead of browser:back when they don't have permission to create content	2017-01-21 18:05:26 +00:00
Andrew Brown	5afa2e9f9a	Only show quick-add form if user has permission to do so	2017-01-21 17:51:06 +00:00
Andrew Brown	7de7d7508d	Allow users with no subscriptions to create up to 5 universes	2017-01-21 17:48:03 +00:00
Andrew Brown	be8d908a80	Move quick add form to partial + allow core content created by anyone	2017-01-21 17:46:53 +00:00
Andrew Brown	6ff3a96583	Update landing page copy	2017-01-21 17:35:11 +00:00
Andrew Brown	31e0239266	Update promo text on landing page	2017-01-21 16:44:00 +00:00
Andrew Brown	41ba0ba862	Use user's active subscriptions in authorizers for permission to create content	2017-01-21 16:41:45 +00:00
Andrew Brown	c8502f1737	Methods for fetching active subscriptions and billing plans on users	2017-01-21 16:38:50 +00:00
Andrew Brown	2d8b5bd7a8	Merge branch 'master' into authority	2017-01-21 16:23:23 +00:00
Andrew Brown	5da038542c	Revert that inflection change because it breaks literally everything ever	2017-01-21 16:23:17 +00:00
Andrew Brown	6a8bebd01c	Merge branch 'master' into authority ... Conflicts: app/models/user.rb	2017-01-21 16:21:46 +00:00
Andrew Brown	16f58c81cb	Clean up User model with has_content concern	2017-01-21 16:20:59 +00:00
Andrew Brown	c2b60a886d	Set 'magic' to pluralize to 'types of magic' globally	2017-01-21 16:19:57 +00:00
Andrew Brown	d11f1707bb	Rake task for defaulting existing users to free/beta plans	2017-01-21 16:08:33 +00:00
Andrew Brown	73531be12f	Initialize default billing plans on server boot	2017-01-21 15:55:16 +00:00
Andrew Brown	cf18b7fb8e	Add subscriptions UI	2017-01-21 15:13:01 +00:00
Andrew Brown	1ec58d3b7b	Model for subscriptions #migration	2017-01-20 21:48:05 +00:00
Andrew Brown	0434242a94	BillingPlan model #migration	2017-01-20 21:45:39 +00:00
Andrew Brown	7186f59665	Add stripe customer id field to user #migration	2017-01-20 21:42:57 +00:00
Andrew Brown	a5e484bc1d	Couple o' todos	2017-01-20 17:19:28 +00:00
Andrew Brown	0eb2eb00c4	Fix attributes admin page 500	2017-01-20 16:20:03 +00:00
Andrew Brown	6299608663	Fix chartkick js init on admin pages	2017-01-20 16:01:54 +00:00