Commit Graph

212 Commits

Author SHA1 Message Date
Andrew Brown
c87cc02ef8 Do the same for the other exports also 2016-10-04 23:03:27 +02:00
Andrew Brown
827b4ea53e Treat deleted universes as gone universes 2016-10-04 22:58:46 +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
6f381c889d Merge branch 'master' into achetype
Conflicts:
	db/schema.rb
2016-10-04 00:16:56 +02:00
Andrew Brown
3b92e011a0 Merge branch 'master' into add-item-past-owners 2016-10-03 22:02:11 +02:00
Ashley Sullins
eb281b6165 Add archetype to character information 2016-10-02 22:24:52 -05:00
Robert Richter
47166e1e72
Use rspec-prof 2016-10-02 14:18:05 -05:00
Robert Richter
922bea78fe
Resolve some unitialized variable warnings 2016-10-02 13:06:15 -05:00
Robert Richter
1ca2444b39
Resolve warning message 2016-10-02 12:02:54 -05:00
Andrew Brown
7e8c60bbe0 Add 'past owners' relation on items 2016-10-02 01:41:31 +02:00
Andrew Brown
ae0a04c2a1 Re-enable dashboard serendipitous card 2016-09-30 12:32:34 +02:00
Andrew Brown
10377a66d8 temporarily disable seren card on dashboard 2016-09-30 04:25:39 +02:00
Andrew Brown
07b5b99b5e Merge branch 'master' into issue-18-serendipitous-i18n 2016-09-30 03:44:30 +02:00
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
50a4626c66 Report new author signups to slackgit status! 2016-09-30 00:32:07 +02:00
Andrew Brown
061f0aef37 Add admin stat pages for users, characters, locations, items, and universes 2016-09-28 23:39:32 +02: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
aa6ac445fd Allow updating privacy field on content 2016-09-24 02:55:48 +02:00
Andrew Brown
9983de1a29 Adjust publicly_shared? logic to account for legacy nil privacy values 2016-09-23 23:25:32 +02:00
Andrew Brown
9f0a82aea2 Two takes on landing pages, each wip 2016-09-14 23:53:52 -05:00
Andrew Brown
6b9c1bf9c5 Add author profile mvp 2016-09-05 23:48:06 -05:00
Andrew Brown
e5f088d3d0 Add users controller + routes for author profiles 2016-09-05 21:51:21 -05:00
Andrew Brown
c839f0d9c2 Add original and current owner relations, maker relations, for items 2016-09-03 17:50:21 -05:00
Andrew Brown
f3d7dbca2b Add leaders relation between location and characters 2016-09-03 17:21:10 -05:00
Andrew Brown
51fecdcaea Add capital cities as location sr-relation to locations 2016-09-03 17:15:26 -05:00
Andrew Brown
75f6d6580b Relate notable_cities as location link on locations 2016-09-03 17:11:34 -05:00
Andrew Brown
10ee0a916d Set up location linking for location#largest_cities 2016-09-03 17:08:03 -05:00
Andrew Brown
db54e3f11f Don't wipe universe on content create #bugfix 2016-09-03 16:27:01 -05:00
Andrew Brown
386965010e Merge branch 'master' of https://github.com/indentlabs/Indent 2016-09-01 23:28:59 -05:00
Robert Richter
af7af4a3e2
Rubocop auto-correct 2016-08-26 14:56:52 -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
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
cf9b4b82fb Allow users to mark their universes (and their contents) as public/private 2016-08-18 17:52:10 -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
405979d239 Better universe param checking 2016-08-11 15:17:24 -05:00
Andrew Brown
e8a91c5ee6 Only filter universes when universe id is integer 2016-08-11 15:14:12 -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
9a8d83adce Redirect dashboard to login for logged out users 2016-08-11 00:09:32 -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
5a9841c6b4 Ensure content privacy 2016-08-10 20:56:35 -05:00
Andrew Brown
715a269429 Don't throw 500 on dashboard if we can't ask question about contnet 2016-08-06 02:57:09 -05:00
Andrew Brown
bfef0ca8f2 Ask users about content on their dashboard 2016-08-06 02:53:37 -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
76be39d214 Allow specifying children of a character 2016-08-06 01:36:24 -05:00