571 Commits

Author	SHA1	Message	Date
Andrew Brown	243d62ff0e	Fix small issue from merge conflict	2017-02-06 11:33:48 +00:00
Andrew Brown	15dbc3074e	Merge branch 'master' into mobile-header-dropdown ... Conflicts: app/views/layouts/_navbar.html.erb	2017-02-06 11:26:15 +00:00
Andrew Brown	b134cf946b	Landing page internationalization	2017-02-03 16:17:12 +00:00
Andrew Brown	7d1d3f176d	Show all included content types on universe#show, not just core types	2017-02-03 15:11:34 +00:00
Andrew Brown	5347bf362f	Don't let beta users change their plan	2017-02-01 15:46:55 +00:00
Andrew Brown	fb5b889993	Open blog post link in a new tab, too	2017-02-01 15:04:51 +00:00
Andrew Brown	20e95ffafb	Don't mind me, forgot link to blog post	2017-02-01 15:03:44 +00:00
Andrew Brown	54eab3dc05	Oopsies, glad we have tests	2017-01-31 21:15:08 +00:00
Andrew Brown	0cff91f542	Fix potential issue with sidebar filter	2017-01-31 21:02:45 +00:00
Andrew Brown	d84b9cf1a3	Show reassuring message to free-for-lifers	2017-01-31 17:57:44 +00:00
Andrew Brown	fae8d059eb	Add subscriptions notice to sidebar	2017-01-31 17:53:57 +00:00
Andrew Brown	2ba92d280e	Redesign notebook download page	2017-01-31 17:53:39 +00:00
Andrew Brown	57110e9e30	Update discount end date	2017-01-31 15:21:02 +00:00
Andrew Brown	cfbc31328c	Add Patreon link if user is subscribed to non-starter	2017-01-30 13:03:00 +00:00
Andrew Brown	d2190ea67f	Show chart of which content types user can currently create/edit	2017-01-30 13:02:42 +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	42c9ddf69b	Merge branch 'master' into authority	2017-01-25 19:18:00 +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	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	22190f064f	Redesign profile page	2017-01-21 19:16:23 +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	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	6a8bebd01c	Merge branch 'master' into authority ... Conflicts: app/models/user.rb	2017-01-21 16:21:46 +00:00
Andrew Brown	cf18b7fb8e	Add subscriptions UI	2017-01-21 15:13:01 +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
Andrew Brown	ccd79e4b43	Mock up billing/payments UI	2017-01-14 02:20:31 +01:00
Robert Richter	d958e5974e	Make Privacy Policy available from the index	2017-01-02 00:26:50 -06:00
Robert Richter	4f8ec97b3a	Make signup/signin buttons collapse into sidenav ... Also added some more content to the sidenav	2017-01-02 00:15:06 -06:00
Robert Richter	298f3b6c48	Remove my awesome graph, no longer needed	2017-01-02 00:12:48 -06:00
Robert Richter	227feeceb0	Terminate a dangling li	2017-01-01 23:51:28 -06:00
Robert Richter	71e017e580	Deduplicate mobile/desktop user dropdowns	2017-01-01 23:50:03 -06:00
Robert Richter	2d77defbd0	Add a temporary graph to document header states	2017-01-01 23:32:21 -06:00
Andrew Brown	990a306b48	Link back to content index pages on content#show by clicking on content type icon	2016-12-26 18:03:53 +01:00
Steven Wallace	a57459a14e	Make content links open in a new tab	2016-11-26 12:43:05 -06:00
Andrew Brown	3b84989321	Show modals again, function method changed apparently	2016-11-06 16:48:42 +01:00