169 Commits

Author	SHA1	Message	Date
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	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
Andrew Brown	ea305c2c53	Send emails from andrew@notebook.ai for now	2016-09-01 23:29:58 -05:00
Andrew Brown	386965010e	Merge branch 'master' of https://github.com/indentlabs/Indent	2016-09-01 23:28:59 -05:00
Andrew Brown	7070ae8b0b	Use sendgrid for emails in production	2016-09-01 23:27:00 -05:00
Robert Richter	af7af4a3e2	Rubocop auto-correct	2016-08-26 14:56:52 -05:00
Andrew Brown	141e5e9d3a	update mailer default host config	2016-08-19 16:55:07 -05:00
Andrew Brown	84d819fcce	Allow users to sign up with and edit a full name, for their public content	2016-08-19 16:46:19 -05:00
Andrew Brown	4b2a73dd8d	Update privacy policy, add bug/feature/feedback form links	2016-08-11 01:30:06 -05:00
Andrew Brown	150200812f	Dat polish tho	2016-08-04 00:51:48 -05:00
Andrew Brown	b7771f4a27	Merge branch 'master' of https://github.com/indentlabs/Indent	2016-07-31 02:00:39 -05:00
Andrew Brown	28cd4c4739	add proof of concept editor	2016-07-31 00:20:28 -05:00
Robert Richter	2996248b42	Enable errors raised in callbacks to be propagated ... Clears up another deprecation warning.	2016-07-11 20:47:58 -05:00
Robert Richter	95229ab26c	Add Cucumber	2016-07-11 20:46:35 -05:00
Robert Richter	89faa430e3	Fix deprecation warning on unit tests	2016-07-11 18:12:55 -05:00
Andrew Brown	c809b3ed9c	Character birthplace / tweaking for Character-->Location relations	2016-05-03 15:46:58 -05:00
Andrew Brown	c0df16d7e0	Add content groupers / organize models	2016-05-03 12:57:00 -05:00
Andrew Brown	344ac20fb7	Relation autocomplete tweaking	2016-04-30 15:14:08 -05:00
Andrew Brown	22b2d2bf66	More routes/code cleanup	2016-04-30 14:41:12 -05:00
Andrew Brown	af01d6e451	routes cleanup	2016-04-30 14:25:08 -05:00
Andrew Brown	80e0a7228f	Relation autocomplete plumbing	2016-04-30 13:06:22 -05:00