26 Commits

Author	SHA1	Message	Date
Robert Richter	03193cea5e	Merge branch 'master' into issue-18-serendipitous-i18n	2016-09-29 20:16:09 -05:00
Robert Richter	3bf3f8412b	Fix merge conflict	2016-09-29 20:08:24 -05:00
Robert Richter	4ee0d5f008	Merge master	2016-09-29 20:06:41 -05:00
Andrew Brown	10aa25882a	Only show serendipitous cards if a user is signed in and owns the content they're looking at	2016-09-26 01:28:11 +02:00
Robert Richter	98bd3c0356	Use Concern version of Serendipitous	2016-09-24 18:40:29 -05:00
Andrew Brown	db54e3f11f	Don't wipe universe on content create #bugfix	2016-09-03 16:27:01 -05:00
Robert Richter	af7af4a3e2	Rubocop auto-correct	2016-08-26 14:56:52 -05:00
Andrew Brown	a5dfe24481	Require users to be logged in to do anything other than show public content	2016-08-18 18:12:20 -05:00
Andrew Brown	30fa5443f0	Allow universes and their content to be marked public manually and adhere to their privacy setting in UI	2016-08-18 16:45:58 -05:00
Andrew Brown	01589d75e9	Re-enable serendipitous cards for content#index, contnent#show, and main#dashboard	2016-08-11 00:51:17 -05:00
Andrew Brown	7271ec72f1	Don't filter universe by universe	2016-08-10 23:50:40 -05:00
Andrew Brown	3c662a8ef6	Universe scoping!	2016-08-10 23:43:11 -05:00
Andrew Brown	417213b130	Allow filtering content by universe	2016-08-10 22:59:51 -05:00
Andrew Brown	e571b2e50f	Don't throw a 500 if we can't generate a question about content, just don't ask the question	2016-08-06 02:15:54 -05:00
Andrew Brown	eda6e72db6	Hook up serendipitous form for simple fields	2016-08-04 20:50:40 -05:00
Robert Richter	8997c51467	Fixed up Characters Controller tests	2016-07-08 21:50:02 -05:00
Andrew Brown	4300bf492a	Edit siblingships/relations from #_form	2016-05-02 19:37:37 -05:00
Andrew Brown	2819f062e3	Use chips in content#show relations	2016-05-02 11:31:47 -05:00
Andrew Brown	6cfd0e06af	Show serendipitous card base	2016-04-25 22:04:00 -05:00
Andrew Brown	afcb02036e	clean up redundancy	2016-04-07 02:30:38 -05:00
Andrew Brown	d1295ef243	ponr: replace custom login with devise login	2016-04-06 15:04:06 -05:00
Andrew Brown	70a1bba5dc	Clean up ContentController complexity	2015-09-01 23:42:54 -05:00
Andrew Brown	317f0e8f7d	Universe abstraction	2015-09-01 23:15:16 -05:00
Andrew Brown	4c45f89501	Fix magic tests with new content stuff	2015-09-01 22:39:39 -05:00
Andrew Brown	d6d10a30cc	Abstract core content functionality from magic controller to content controller	2015-09-01 22:08:34 -05:00
Andrew Brown	7b10a746c8	ContentController parent class for content	2015-09-01 20:28:24 -05:00