188 Commits

Author	SHA1	Message	Date
Andrew Brown	f2895837f8	Round out race planning	2016-10-21 23:02:26 +02:00
Andrew Brown	157dc9b5a0	Translations and serendipitous questions for creatures	2016-10-21 14:20:23 +02:00
Andrew Brown	69f6a7cbf0	Graphical headers on content index pages	2016-10-19 00:20:46 +02:00
Andrew Brown	77ab817ddf	Add groups as content type	2016-10-17 23:54:23 +02:00
Andrew Brown	8d3e7ecbad	Add scenes as a content type	2016-10-17 00:18:15 +02:00
Andrew Brown	618c791377	Add languages as content type	2016-10-16 23:58:54 +02:00
Andrew Brown	7add2f055a	Add magic as a content type	2016-10-16 23:29:36 +02:00
Andrew Brown	848f796a5c	Merge branch 'master' into content-expansion ... Conflicts: app/assets/stylesheets/navbar.css	2016-10-16 23:15:48 +02:00
Andrew Brown	275ab75355	Add religion as a content type	2016-10-15 00:46:46 +02:00
Andrew Brown	3440db3b5e	Add race as content type	2016-10-15 00:15:36 +02:00
Andrew Brown	4440c7b2df	Add creatures content type	2016-10-14 23:26:32 +02:00
Robert Richter	0c2612ad82	Merge branch 'master' into use-puma	2016-10-12 16:44:00 -05:00
Andrew Brown	790b12c15b	Add xml exporting	2016-10-10 13:07:19 +02:00
Andrew Brown	6eda3a9fa3	Add requested fields to locations	2016-10-05 14:09:21 +02:00
Andrew Brown	ee9841c387	Add 'nature' tab to characters	2016-10-05 14:00:03 +02:00
Andrew Brown	ff83359f1b	Add rules field to universe	2016-10-05 13:25:29 +02:00
Andrew Brown	00563e536f	Merge branch 'master' into exporting	2016-10-04 14:27:38 +02:00
Andrew Brown	1c937fea5b	Add content exporting to TXT, CSV, and JSON	2016-10-04 14:25:28 +02:00
Andrew Brown	7f19b7635f	Merge branch 'master' into use-puma	2016-10-04 12:50:25 +02:00
Robert Richter	5b63f4b4a1	Merge branch 'master' into use-puma	2016-10-03 17:28:09 -05:00
Robert Richter	0f84be78d7	Add Puma and config some threading	2016-10-03 17:27:28 -05:00
Andrew Brown	a5e9fd7601	Merge branch 'master' into serendipitous-improvements	2016-10-04 00:21:20 +02:00
Andrew Brown	6f381c889d	Merge branch 'master' into achetype ... Conflicts: db/schema.rb	2016-10-04 00:16:56 +02:00
Andrew Brown	cbe37b40c4	Merge branch 'master' into serendipitous-improvements	2016-10-03 22:02:02 +02:00
Andrew Brown	f277853df2	Couple other typos	2016-10-03 21:41:33 +02:00
Ashley Sullins	eb281b6165	Add archetype to character information	2016-10-02 22:24:52 -05:00
Robert Richter	40481975f4	Merge branch 'master' into feature/migrate-tests	2016-10-01 14:38:51 -05:00
Robert Richter	1ce16228a7	Extract content tests into an example	2016-10-01 12:21:19 -05:00
Andrew Brown	e4b6bbbc8d	Fix crops typo	2016-10-01 18:45:36 +02:00
Andrew Brown	aefe1d4774	comment out relations from serendip card	2016-09-30 04:18:40 +02:00
Andrew Brown	9e2c0ff90e	Don't ask about birthplace until we can do location linking in serendipitous	2016-09-30 04:15:00 +02:00
Andrew Brown	07b5b99b5e	Merge branch 'master' into issue-18-serendipitous-i18n	2016-09-30 03:44:30 +02:00
Robert Richter	4ee0d5f008	Merge master	2016-09-29 20:06:41 -05:00
Andrew Brown	b8496e9dc7	Fix skintone test	2016-09-29 21:40:30 +02:00
Andrew Brown	96be59d85b	dashboard, footer, and misc polish	2016-09-29 21:35:43 +02:00
Andrew Brown	dd6c8789bf	Content show page polish / autocomplete hooks	2016-09-29 19:57:42 +02:00
Andrew Brown	96393e75ef	Add the rest of the graphs	2016-09-29 00:29:10 +02:00
Andrew Brown	061f0aef37	Add admin stat pages for users, characters, locations, items, and universes	2016-09-28 23:39:32 +02:00
Robert Richter	98bd3c0356	Use Concern version of Serendipitous	2016-09-24 18:40:29 -05:00
Robert Richter	0823d2e026	Merge branch 'master' into add-gravatars	2016-09-22 10:28:59 -05:00
Andrew Brown	95fd2cf6bd	Merge branch 'master' into landing-page-redesign ... Conflicts: app/views/main/index.html.erb	2016-09-22 05:39:41 +02:00
Robert Richter	96fb62e758	Display user image to their profile page	2016-09-21 21:13:30 -05:00
Robert Richter	aa83c3a723	Remove sitemap stuff, for now	2016-09-19 22:00:07 -05:00
Andrew Brown	9f0a82aea2	Two takes on landing pages, each wip	2016-09-14 23:53:52 -05:00
Robert Richter	ccc2aeef24	Add JSON LD blocks to User pages	2016-09-06 10:23:05 -05:00
Robert Richter	2d65d86601	Add user profiles to sitemap	2016-09-06 09:25:15 -05:00
Robert Richter	d1b0c5b517	Merge branch 'master' into issue-6-seo	2016-09-06 09:23:01 -05:00
Robert Richter	1e5658c771	Add sitemap gem	2016-09-06 09:20:55 -05:00
Andrew Brown	e5f088d3d0	Add users controller + routes for author profiles	2016-09-05 21:51:21 -05:00
Andrew Brown	a0a0f787bb	Send emails from notebook@notebook.ai instead	2016-09-01 23:37:34 -05:00