4221 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrew Brown	50070c4a9f	Add soft deletion to users and all content models	2017-12-26 14:37:09 -06:00
Andrew Brown	77ba740f8d	Replace reference to plantlife in creatures to 'critters'	2017-12-26 13:13:28 -06:00
Andrew Brown	4d2a6dc8f9	restart	2017-12-23 20:55:52 -06:00
Andrew Brown	ea54aca688	restart again, sorry for the heroku hax	2017-12-23 10:05:20 -06:00
Andrew Brown	e0cc206145	force app restart	2017-12-23 10:00:08 -06:00
Andrew Brown	445b396f49	minor tweak in readme	2017-12-01 21:39:17 +01:00
Andrew Brown	a48ce0069b	only show recent activity if there is any	2017-11-25 23:08:28 +01:00
Andrew Brown	f35b512515	profile tweak	2017-11-25 22:47:54 +01:00
Andrew Brown	d27244217a	increase recent activity count	2017-11-25 05:06:31 +01:00
Andrew Brown	c1b57c3c16	include user universes page	2017-11-25 04:59:33 +01:00
Andrew Brown	b9cf1ee3e7	redesign user profile page	2017-11-25 04:56:06 +01:00
Andrew Brown	e0fcc4ee6d	actually test what was meant to be tested	2017-11-24 16:18:40 +01:00
Andrew Brown	0d0334ae3d	add tests for storage space adjustments	2017-11-24 16:14:25 +01:00
Andrew Brown	ed2e6e301f	add landing page strings to i18n file	2017-11-24 15:26:59 +01:00
Andrew Brown	aedc6932f5	Merge pull request #244 from babu-thomas/issue#190 ... [WIP] Delete relation objects when objects owning them are deleted	2017-11-24 15:00:19 +01:00
Andrew Brown	1d3363b6d0	Merge branch 'master' into issue#190	2017-11-24 14:30:15 +01:00
Andrew Brown	ff87155812	address security vulns	2017-11-24 00:57:02 +01:00
Andrew Brown	d988a3f38d	only send to mixpanel in prod	2017-11-11 21:25:17 +01:00
Andrew Brown	f548c83143	Fix 500 on content pages for people with negative upload bandwidth	2017-11-11 20:53:48 +01:00
Andrew Brown	f3a4af04e2	divide by cents	2017-11-11 18:08:29 +01:00
Andrew Brown	d1705323d2	pass tests by checking env until I can figure out how to mock Stripe::StripeObject#save	2017-11-10 16:40:38 +02:00
Andrew Brown	9c6b3711cc	fix bug in downgrading to starter being out of sync sometimes	2017-11-10 16:38:49 +02:00
Andrew Brown	91aac1622d	add test for upgrading to premium	2017-11-10 16:38:21 +02:00
Andrew Brown	9560c5b1e3	report correct sub counts to slack	2017-11-10 16:15:05 +02:00
Andrew Brown	1bbb8e3577	this should not be checked in	2017-11-09 20:32:52 +02:00
Andrew Brown	637a9c5ba4	whoops, forgot to check in routes change	2017-11-09 20:30:18 +02:00
Andrew Brown	6f003ce7a3	add floras to exportable csvs	2017-11-09 20:18:16 +02:00
Andrew Brown	1593fbf484	Use AttributeAuthorizer for attributes, attribute fields, and attribute categories	2017-11-09 19:12:44 +02:00
Andrew Brown	77f8fee363	Merge branch 'master' into issue#190	2017-11-09 17:23:47 +01:00
Babu Thomas	a03a0c9fdb	Add deletion test for sibling relation	2017-11-06 02:42:40 +05:30
Andrew Brown	a6fd516b49	conclude october promo	2017-11-01 16:54:59 +02:00
Andrew Brown	4b7b6819db	enable discussions in sidenav	2017-10-29 02:20:34 +03:00
Andrew Brown	1827749611	use delayed_job in prod	2017-10-29 02:11:46 +03:00
Andrew Brown	dcee646739	add delayed_job table	2017-10-29 02:03:56 +03:00
Andrew Brown	5b2f0a064d	prepend forum usernames with @	2017-10-29 02:00:56 +03:00
Andrew Brown	5d0e5d7b5f	add delayed_job to see if thredded uses it	2017-10-29 01:59:45 +03:00
Andrew Brown	1208e874da	strings	2017-10-29 01:36:23 +03:00
Andrew Brown	807f67d702	remove wrong admin flag	2017-10-29 01:17:46 +03:00
Andrew Brown	60b24af449	flip over to new admin flag	2017-10-29 01:12:15 +03:00
Andrew Brown	c503825fd5	add boolean admin flag for forums	2017-10-29 01:11:32 +03:00
Andrew Brown	bcb8d8f3e4	add goog analytics to forums pages	2017-10-29 00:43:33 +03:00
Andrew Brown	ba5e03ac27	use blacklist for not showing content	2017-10-28 23:53:59 +03:00
Andrew Brown	d1a42d87be	blacklist abusive users from creating additional content	2017-10-28 23:21:08 +03:00
Andrew Brown	8193a279de	require at least ruby 2.3 for &. usage on heroku	2017-10-28 22:58:03 +03:00
Andrew Brown	4dc933023c	Merge branch 'master' of github.com:indentlabs/notebook	2017-10-28 22:45:48 +03:00
Andrew Brown	2c778975cf	Merge pull request #225 from indentlabs/thredded ... Add forums	2017-10-28 21:45:20 +02:00
Andrew Brown	d86b7a3673	one release before forums soft launch	2017-10-28 22:37:23 +03:00
Andrew Brown	d253e7c36c	hide sidenav link for soft launch + testing	2017-10-28 22:19:25 +03:00
Andrew Brown	4e8d1ba9b8	Merge branch 'master' into thredded	2017-10-28 21:10:24 +03:00
Andrew Brown	bfd0585a24	notebook.ai in readme	2017-10-28 21:00:39 +03:00