mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,396 Commits 83 Branches 44 Tags 172 MiB
6e2c96bc2a
Commit Graph

1118 Commits

Author SHA1 Message Date
Andrew Brown
fb602b7d95 Fix tests that were creating a universe with no user 2017-10-01 12:21:53 +02:00
Andrew Brown
577de5f447 Merge branch 'master' into thredded 
Conflicts:
	db/schema.rb
 2017-09-30 15:44:27 +02:00
Andrew Brown
f09bf94e39 Merge branch 'master' into collaboration 
Conflicts:
	app/controllers/content_controller.rb
 2017-09-30 15:09:11 +02:00
Andrew Brown
7d9539388f Only use mixpanel in production 2017-09-30 14:08:49 +02:00
Andrew Brown
f47741558b we're making things happen 2017-08-17 03:10:18 +02:00
Andrew Brown
dfdc958ab8 it'll all be over soon 2017-08-17 02:35:38 +02:00
Andrew Brown
e1e5c9bdfa cleanup 2017-08-17 00:49:07 +02:00
Andrew Brown
dfdb81d854 more permissions 2017-08-17 00:30:48 +02:00
Andrew Brown
c150e20eac content creation permissions 2017-08-17 00:29:48 +02:00
Andrew Brown
cfddd9a7ad allow scoping to contrib universes 2017-08-15 14:30:54 +02:00
Andrew Brown
39327f8d5f assign invites to users on signup 2017-08-15 13:51:17 +02:00
Andrew Brown
5be74214cc allow leaving a universe as collaborator 2017-08-15 13:38:56 +02:00
Andrew Brown
4b57069fa6 Allow viewing/editing collaborative content 2017-08-15 04:47:30 +02:00
Andrew Brown
8be6113fbe include contributor content in content lists 2017-08-15 04:08:26 +02:00
Andrew Brown
4eea63b868 removing contributors flow 2017-08-15 03:10:46 +02:00
Andrew Brown
1f9346f2fd Create contributors in flow 2017-08-15 02:10:31 +02:00
Andrew Brown
0022adb953 Contributor invite flow #migration 2017-08-15 01:41:43 +02:00
Andrew Brown
f3f40c97fd Scope content properly 2017-08-08 01:08:09 +02:00
Andrew Brown
cbda4b4c71 Order universe content list 2017-08-05 02:05:11 +02:00
Andrew Brown
06c2d08c9b Universe-specific relation pages for content types 2017-08-05 01:52:20 +02:00
Andrew Brown
bd1a16cbff Allow changing flora privacy 2017-07-31 13:35:18 +02:00
Andrew Brown
7ce2864d3a add flora to contexts 2017-07-31 03:37:15 +02:00
Andrew Brown
8a5c53e467 Add flora relations 2017-07-31 03:20:36 +02:00
Andrew Brown
d6daf0c204 Add Flora model #migration 2017-07-31 02:39:13 +02:00
Andrew Brown
ead954094b polishing 2017-07-26 20:53:05 +02:00
Andrew Brown
a706444e83 Require users to be logged in to search 2017-06-20 17:16:41 +00:00
Andrew Brown
578b365c22 Add super-secret search results page 2017-06-20 16:34:17 +00:00
Andrew Brown
30cc6101f0 Clarify hour of drawing 2017-06-14 18:20:43 +00:00
Andrew Brown
f8eb898e92 add pinboard starter 2017-06-02 17:12:03 +00:00
Andrew Brown
6bab8f6cb3 Default billing plans should have 0 cents per month 2017-05-23 17:26:08 +00:00
Andrew Brown
258e49a105 Require login for notes page 2017-05-18 00:01:17 +01:00
Andrew Brown
82e8da4d6f Give users a choice between full-width and fixed-width designs #migration 2017-05-17 17:51:55 +01:00
Andrew Brown
6eb2e08102 Add scratchpad page and update sidebar design #migration 2017-05-17 16:54:30 +01:00
Andrew Brown
310dd17ed0 If a user subscribes without a referrer, treat them as referring themselves 2017-05-03 17:51:25 +01:00
Andrew Brown
adcea851f4 Add babel translation app 2017-05-01 15:35:03 +01:00
Andrew Brown
8bcd9172b7 Integrated js navigator PoC 2017-04-30 01:57:44 +01:00
Andrew Brown
be30adb9f2 Redirect after voting even if no referer is set 2017-04-28 13:21:04 +01:00
Andrew Brown
e731074e1c syntax error 2017-04-27 21:31:29 +01:00
Andrew Brown
c6d93ee94f Don't give extra kb for switching between premiums 2017-04-27 21:17:17 +01:00
Andrew Brown
5d59c8f3a3 update raffle date 2017-04-27 19:49:05 +01:00
Andrew Brown
b1eb2a8155 Add community drive infos to billing page 2017-04-17 21:47:25 +01:00
Andrew Brown
4aef7b9d83 Add raffle entries to users #datamigration 2017-04-17 20:08:58 +01:00
Andrew Brown
cc0662c1c3 Store referral codes in session so users can browse around a bit before signing up 2017-04-17 18:29:44 +01:00
Andrew Brown
8d0bda1230 Add sign in link for referral login origin 2017-04-17 17:55:54 +01:00
Andrew Brown
c3b00257a2 Voting MVP 2017-04-17 16:22:02 +01:00
Andrew Brown
86ae882c51 Add one-click unsubscribe action for emails 2017-04-15 19:44:30 +01:00
Andrew Brown
6ebb512085 Fix subscription reporting 2017-04-11 18:05:57 +01:00
Andrew Brown
ce6dda81b6 Add worldbuilding prompts page 2017-04-11 17:47:47 +01:00
Andrew Brown
5a14e17957 Verbiage tweaks on new plans 2017-04-11 17:01:25 +01:00
Andrew Brown
a63afd71fc Integrate referral codes with signup #migrations 2017-04-03 19:10:05 +01:00
Andrew Brown
b9d0f8640d Clean up unused views 2017-04-03 17:28:52 +01:00
Andrew Brown
4f58fed792 /for/friends improvements 2017-03-30 21:38:45 +01:00
Andrew Brown
3e9a5ed86d Redirect from dashboard to login properly 2017-03-27 11:44:33 +01:00
Andrew Brown
eca442d3a4 Add recent content page 2017-03-26 23:28:12 +01:00
Andrew Brown
5856865504 Add genre field to universe 2017-03-26 18:03:00 +01:00
Andrew Brown
7e782f7c40 Add languages link to locations 2017-03-26 17:44:52 +01:00
Andrew Brown
cf6cd4a53a Delete empty attribute categories after deleting the last attribute in them, fixes #191 2017-03-24 23:04:02 +00:00
Andrew Brown
7e83fb1e1d Verbiage change 2017-03-24 22:01:02 +00:00
Andrew Brown
2f7e199fff Track total sub amount on premium changes 2017-03-24 21:37:18 +00:00
Andrew Brown
2b1355b053 Add super secret page that no one knows about 2017-03-19 23:49:36 +00:00
Andrew Brown
050baf7205 Fix: Subscriptions don't autorenew on expiration, so we create longer ones. Duration doesn't matter since we truncate all active ones on plan change. 2017-03-14 20:50:39 +00:00
Andrew Brown
0ac1eea6c6 Add landing page for roleplayers sans comparison chart 2017-03-08 16:24:31 +00:00
Andrew Brown
31ff49195b Add for/writers landing page 2017-03-08 15:50:51 +00:00
Andrew Brown
f20a9f1044 Limit dashboard questions to the current universe if universe scope is set 2017-03-01 16:16:44 +00:00
Andrew Brown
0ca4e04b12 Merge branch 'master' into release/material-design-tweaks 
Conflicts:
	app/views/content/show.html.erb
 2017-02-28 22:38:22 +00:00
Andrew Brown
e80c6a22a6 Add character-spouse two-way relation, and 2w related creatures relation 2017-02-28 16:46:47 +00:00
Andrew Brown
d2c310fe0f Differentiate between redirecting to content and looking at content 2017-02-27 19:41:41 +00:00
Andrew Brown
eb934ba59d WIP dashboard designs 2017-02-23 23:05:47 +00:00
Andrew Brown
619d034eba Don't error on anonymous users viewing content :| 2017-02-22 13:25:28 +00:00
Andrew Brown
28b01532e4 Fix mixpanel track on image upload 2017-02-21 19:14:50 +00:00
Andrew Brown
9824991795 Add a few other js mixpanel tracks 2017-02-21 17:35:31 +00:00
Andrew Brown
963769e3c9 Add mixpanel action tracking for all server actions 2017-02-21 17:12:43 +00:00
Andrew Brown
8d480f7efd Fix typo in religion "other names" field strong param 2017-02-20 21:05:58 +00:00
Andrew Brown
f6a9dfa63e Fix out-of-space message on upload and CTA 2017-02-20 18:11:49 +00:00
Andrew Brown
a90f042caa Allow uploading more than 2 images at a time 2017-02-20 17:46:59 +00:00
Andrew Brown
9cd7bfa396 Allow uploading images alongside initial content creation 2017-02-20 16:22:40 +00:00
Andrew Brown
db1edb48f6 Enable image uploads on all content 2017-02-20 16:05:16 +00:00
Andrew Brown
3da3e694a6 Show bandwidth on billing page, up kb to 1GB for premium users 2017-02-18 02:55:59 +00:00
Andrew Brown
96e0a60ea9 Subtract account bandwidth on upload, refund on delete 2017-02-18 02:24:38 +00:00
Andrew Brown
6ce64d09b0 Merge branch 'master' into release/uploads 
Conflicts:
	app/views/content/form/_panel.html.erb
	app/views/content/show.html.erb
 2017-02-18 00:56:37 +00:00
Andrew Brown
ee13d748f3 Fix image destroy callback 2017-02-18 00:26:58 +00:00
Andrew Brown
c7af58da77 Delete images on s3 also 2017-02-18 00:11:35 +00:00
Andrew Brown
f30baeabfa allow deleting uploaded images 2017-02-17 23:48:21 +00:00
Andrew Brown
ee5fe081e7 Store modified image styles properly, e2e uploads tested 2017-02-17 22:07:25 +00:00
Andrew Brown
bb01a25614 Upload images to S3 2017-02-17 21:03:29 +00:00
Andrew Brown
737273d2ae Single image uploading, needs processing in controller 2017-02-17 01:41:41 +00:00
Andrew Brown
73a050b8bc Handle dashboards with no content too 2017-02-06 20:13:33 +00:00
Andrew Brown
3402575fbd Oops, make sure we don't infinite loop :) 2017-02-06 20:04:48 +00:00
Andrew Brown
84f1e86ce7 Report subscriptions to Slack even if there's an issue with delta change 2017-02-06 17:42:22 +00:00
Andrew Brown
5183f45d78 Try up to 5 times to create a serendip question to ask 2017-02-06 17:12:56 +00:00
Andrew Brown
270d32ed92 Serendipitous: ask questions about any of the user's content, not just core content 2017-02-06 16:50:12 +00:00
Andrew Brown
2d0d47d355 Don't error on numerical content values in outline export 2017-02-06 10:53:09 +00:00
Andrew Brown
a245f3ebbf Fix custom attributes exporting on content 2017-02-03 17:17:08 +00:00
Andrew Brown
8c76a03774 Proper auth permissions on admin/content/export controllers 2017-02-03 14:43:55 +00:00
Andrew Brown
34f61a044b Use default user permissions for logged-out users 2017-02-02 22:24:00 +00:00
Donovan Hernandez
46e33299ea Fix Universe names upon export 2017-02-01 19:24:44 -06:00
Andrew Brown
06ffb6c943 Redirect signed-out users to login page from subscription page 2017-02-01 16:06:13 +00:00
Andrew Brown
35dfd24524 Fix verbiage on success notice 2017-02-01 14:24:51 +00:00
Andrew Brown
0afa6f8e54 Fix tests not having billing plans to report 2017-01-27 21:50:54 +00:00
Andrew Brown
459fee484b Add per-user email subscription preference and way to edit 2017-01-27 21:00:11 +00:00
Andrew Brown
cc30160655 Report new signups to Slack properly 2017-01-27 16:06:01 +00:00
Andrew Brown
8fec40536f Merge branch 'authority' of github.com:indentlabs/notebook into authority 2017-01-27 16:01:10 +00:00
Andrew Brown
66ca8b8d31 Merge branch 'master' into authority 2017-01-27 15:10:39 +00:00
Andrew Brown
42c9ddf69b Merge branch 'master' into authority 2017-01-25 19:18:00 +00:00
Andrew Brown
3f1a6faa14 Fix flow of payment info --> upgrade to actually upgrade 2017-01-24 15:12:15 +00:00
Andrew Brown
70136ce9cd Don't require a payment method when switching back to Starter 2017-01-24 14:10:46 +00:00
Andrew Brown
8aa3cf7f4a Allow deleting payment method, retains subscription until end_date 2017-01-24 13:46:08 +00:00
Andrew Brown
3d285b0b99 Handle failed card payments on upgrade 2017-01-24 13:45:43 +00:00
Andrew Brown
548f9acdd2 Allow users to modify/remove payment methods and view billing history 2017-01-24 00:02:48 +00:00
Andrew Brown
959731ac43 Ask for card info and allow switching between subscription tiers 2017-01-23 21:59:07 +00:00
Andrew Brown
1da55caaab Make subscription page content based on current subscription for upgrade/downgrade 2017-01-23 16:34:12 +00:00
Andrew Brown
7fe2a6eb8c Fix privacy not being allowed to be modified on half the content #whoops 2017-01-21 19:16:11 +00:00
Andrew Brown
cf18b7fb8e Add subscriptions UI 2017-01-21 15:13:01 +00:00
Andrew Brown
8ae77f4b67 Implement authority for user permissions 2017-01-14 00:06:33 +01:00
Andrew Brown
e8afa326b3 Handle camel case properly when redirecting to multi-word controller paths 2016-11-06 18:25:24 +01:00
Andrew Brown
38244ac022 Don't catch require_ownership exceptions so we can see error in prod logs 2016-11-06 18:15:35 +01:00
Mitchel Pigsley
5254db5cf1 Add custom attribute values to the extended and collective pages 2016-11-03 16:55:59 -05:00
Andrew Brown
9451c60d6f Add group memberships and locations 2016-11-02 21:35:41 +01:00
Andrew Brown
c2ea56d5e0 Allow editing races on characters 2016-11-02 19:10:53 +01:00
Andrew Brown
07c372eb01 Fix CSV exports 2016-11-02 14:10:16 +01:00
Andrew Brown
2f68c5eccd Fix json and xml data exports 2016-11-02 14:01:57 +01:00
Andrew Brown
efd4181972 Fix text data export 2016-11-02 14:00:18 +01:00
Andrew Brown
a896c3c5ae Migrate content types to the new attribute system 2016-11-01 21:51:57 +01:00
Andrew Brown
d107512438 Merge branch 'custom-attributes' into content-expansion 
Conflicts:
	app/models/content_types/character.rb
	app/models/user.rb
	app/views/content/_form.html.erb
	app/views/content/form/_text_input.html.erb
	app/views/content/index.html.erb
	app/views/content/list/_list.html.erb
	app/views/content/show.html.erb
	app/views/items/edit.html.erb
	app/views/items/new.html.erb
	app/views/locations/edit.html.erb
	app/views/locations/new.html.erb
	app/views/universes/edit.html.erb
	app/views/universes/new.html.erb
	config/locales/en.yml
	config/routes.rb
	db/schema.rb
 2016-11-01 21:02:12 +01:00
Matthew Werner
72c66a60cb Attribute Field Dropdowns 2016-10-31 16:32:41 -07:00
Matthew Werner
149199a281 make content controller create more flexible to avoid overriding in subclass 2016-10-25 16:58:23 -07:00
Matthew Werner
0c84046330 clean up unnecessary changes 2016-10-25 16:48:07 -07:00
Matthew Werner
9299699f4b better category and field creation 2016-10-25 16:37:35 -07:00
Matthew Werner
5b58364c97 merge in upstream 2016-10-25 11:05:22 -07:00
Matthew Werner
01f791d149 merge upstream 2016-10-25 10:43:18 -07:00
Andrew Brown
c70c079f56 Add characters, locations, and items relations to scenes 2016-10-24 22:55:46 +02:00
Andrew Brown
3a0f23b3e1 Add magic relations, add spoken language relation to characters 2016-10-24 22:30:38 +02:00
Andrew Brown
8b0ce69d56 Add relations to groups 2016-10-24 14:52:30 +02:00
Andrew Brown
44d13f7086 Fix up religion links 2016-10-24 14:06:28 +02:00
Andrew Brown
33f11a8c0b Add links to religions 2016-10-22 01:21:44 +02:00
Andrew Brown
411eff77bb Create and associate races for each character with a race value 2016-10-22 00:26:00 +02:00
Andrew Brown
f2895837f8 Round out race planning 2016-10-21 23:02:26 +02:00
Andrew Brown
8dd30d181e Link creatures to Location habitats 2016-10-21 13:53:55 +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
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
1f4198828a Clean up redundant views 2016-10-14 23:34:59 +02:00
Andrew Brown
4440c7b2df Add creatures content type 2016-10-14 23:26:32 +02:00
Matthew Werner
7b109eb12b clean up 2016-10-10 16:45:03 -07:00
Matthew Werner
eca50c3276 make attribute categories accessible 2016-10-10 16:20:47 -07:00
Matthew Werner
5a3cfcb6d1 Convert attribute_categories to system categories 2016-10-10 14:47:51 -07:00
Andrew Brown
790b12c15b Add xml exporting 2016-10-10 13:07:19 +02:00
Andrew Brown
9ddcb31489 Add button to add more content at the top of content#index pages 2016-10-05 14:15:36 +02:00
Andrew Brown
6eda3a9fa3 Add requested fields to locations 2016-10-05 14:09:21 +02:00
Andrew Brown
ee3fa7b0af Allow editing the new universe fields 2016-10-05 14:01:20 +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
a32d380eb0 Allow use of locations#language 2016-10-05 12:44:49 +02:00
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
Andrew Brown
eda6e72db6 Hook up serendipitous form for simple fields 2016-08-04 20:50:40 -05:00
Andrew Brown
b7771f4a27 Merge branch 'master' of https://github.com/indentlabs/Indent 2016-07-31 02:00:39 -05:00
Andrew Brown
dbe6118efe Lean entity extraction + contextual card popups in editor 2016-07-31 01:36:54 -05:00
Andrew Brown
28cd4c4739 add proof of concept editor 2016-07-31 00:20:28 -05:00
Robert Richter
8997c51467 Fixed up Characters Controller tests 2016-07-08 21:50:02 -05:00
Andrew Brown
c809b3ed9c Character birthplace / tweaking for Character-->Location relations 2016-05-03 15:46:58 -05:00
Andrew Brown
829d7709ab Self referential assoc cleanup 2016-05-03 15:06:02 -05:00
Andrew Brown
5062a41f89 All self-referential relations for Characters 2016-05-03 14:48:01 -05:00
Andrew Brown
ffdb9c7b26 Character#mothers is now a relation 2016-05-03 13:45:14 -05:00
Andrew Brown
bd6a2236db Characters#fathers is now a relation 2016-05-03 13:34:05 -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
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
80e0a7228f Relation autocomplete plumbing 2016-04-30 13:06:22 -05:00
Andrew Brown
c611022f1d Recognize associations on content#edit 2016-04-30 12:21:32 -05:00
Andrew Brown
1d12e96506 Siblingship join model 2016-04-29 14:01:35 -05:00
Andrew Brown
395fc83b89 Remove siblings from Character 2016-04-29 13:58:53 -05:00
Andrew Brown
9719fdbeed cleanup 2016-04-27 16:22:12 -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
467cf6e33d Abstract new/edit forms to content model 2016-04-06 23:30:14 -05:00
Andrew Brown
e55287c8d4 character show page 2016-04-06 22:30:18 -05:00
Andrew Brown
029032900a restyle dashboard 2016-04-06 18:45:14 -05:00
Andrew Brown
d2209b2374 Rename equipment to items, hook up nav links 2016-04-06 17:46:18 -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
9f1fada4c2 Remove dead code 2015-09-01 23:20:56 -05:00
Andrew Brown
317f0e8f7d Universe abstraction 2015-09-01 23:15:16 -05:00
Andrew Brown
2db13f92f1 Locations abstraction 2015-09-01 23:07:53 -05:00
Andrew Brown
3a98e48bf5 Language abstraction 2015-09-01 22:59:07 -05:00
Andrew Brown
95eb44616d Equipment abstraction 2015-09-01 22:53:50 -05:00
Andrew Brown
1172be4c9d Characters abstraction 2015-09-01 22:49:59 -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
Andrew Brown
8f88d28c0e Rubocopification 2015-09-01 20:27:07 -05:00
Andrew Brown
d16464320e Slurp privacy into ownership concern 2015-08-28 00:21:04 -05:00
Andrew Brown
c07c178a42 HasOwnership concern 2015-08-28 00:06:09 -05:00
Andrew Brown
5330551899 A couple minor bugs 2015-08-27 23:54:03 -05:00
Andrew Brown
fee8cfa7e0 Hit ownership with a dose of metaprogramming 2015-08-27 23:46:59 -05:00
Andrew Brown
f2df776684 Clean up picker selector 2015-08-27 23:12:21 -05:00
Andrew Brown
5248c0b802 Revert "Internationalize strings" 2015-04-28 23:04:18 -05:00
Robert Richter
bc41bc0e4b Style fixes 2015-04-25 14:06:56 -05:00
Robert Richter
37d39e6e97 Add locale validation 2015-04-25 13:12:23 -05:00
Robert Richter
2e97ab48a7 Remove duplicated l10n functions 2015-04-23 21:21:28 -05:00
Robert Richter
a831f88816 Merge branch 'start-i18n' of https://github.com/Cantido/Indent into start-i18n 2015-04-23 18:17:05 -05:00
Robert Richter
92df67eb03 Create a concern to set current locale 2015-04-23 18:16:32 -05:00
Robert Richter
6e5f778cb6 Set locale for each request 
Can be set by either the HTTP_ACCEPT_HEADER, or through
passing a "locale=??" parameter in the URL.
 2015-04-23 18:16:30 -05:00
Robert Richter
7403a820eb Set locale for each request 
Can be set by either the HTTP_ACCEPT_HEADER, or through
passing a "locale=??" parameter in the URL.
 2015-04-22 23:04:58 -05:00
Robert Richter
860f5d48c8 Fix function that creates 10 anonymous users every call 2015-04-20 19:16:20 -05:00
Robert Richter
3df0ff50e1 Migrate to built-in ActiveModel secure passwords 2015-04-19 19:29:42 -05:00
Robert Richter
6d05bc769e Fix a string containing escape characters 2015-04-18 22:57:11 -05:00
Robert Richter
cbe0dbda1d Create tests for the locations generator 2015-04-01 16:57:58 -05:00
Robert Richter
1c87087861 Add missing equals sign 2015-03-29 20:17:34 -05:00
Robert Richter
8266acdd56 I did translation parameters wrong 2015-03-29 16:52:08 -05:00
Robert Richter
9206f97c51 Clean style of SessionsController 2015-03-29 16:25:57 -05:00
Robert Richter
86f1a29b7f Clean style of MagicController 2015-03-29 16:24:55 -05:00
Robert Richter
ced01ecd28 Clean style of LocationsController 2015-03-29 16:23:01 -05:00
Robert Richter
7c817c9984 Clean style of LanguagesController 2015-03-29 16:22:08 -05:00
Robert Richter
5bf4e4fcf5 Loosen RuboCop restrictions to fit respon_to block 2015-03-29 16:19:28 -05:00
Robert Richter
9ce65f6f48 Add Login method required by users_controller 2015-03-29 16:18:13 -05:00
Robert Richter
bcdd4721c7 Clean style of UsersController 2015-03-29 16:16:58 -05:00
Robert Richter
b484e04b49 Clean style of UniversesController 2015-03-29 16:05:27 -05:00
Robert Richter
0565266a20 Clean style of ApplicationHelper 2015-03-28 21:45:05 -05:00
Robert Richter
9a0475c516 Refactor to access data via User object 2015-03-28 12:22:47 -05:00
Robert Richter
5b623ce7e9 Clean style of MainController 2015-03-28 12:18:33 -05:00
Robert Richter
e7340ea2c8 Consolidate model update and creation translations 2015-03-28 11:09:42 -05:00
Robert Richter
0f8fbc70a2 Fix two minor offenses in the CharactersGenerator 2015-03-27 23:47:41 -05:00
Robert Richter
c032b57318 Refactor GeneratorController 
Split it up into three generator controllers.

Also i18n'd all strings
 2015-03-27 22:56:45 -05:00
Robert Richter
a6728af397 Clean style in the EquipmentController 2015-03-27 18:20:29 -05:00
Robert Richter
70de798c77 Use ActiveRecord ordering instead of array.sort 2015-03-26 18:24:05 -05:00
Robert Richter
a7ba0ff9d6 Remember that Ruby is not Java 2015-03-26 18:19:16 -05:00
Robert Richter
00e793bf1e Refactor style using the Rubocop auto-correct 2015-03-25 22:42:45 -05:00
Robert Richter
dfd80d9539 Refactor CharactersController for style 2015-03-25 22:38:18 -05:00
Robert Richter
1e06763f98 Refactor ApplicationController for style 
Strings were internationalized, methods extracted, partials written.
 2015-03-24 20:25:57 -05:00
Robert Richter
532e2ef0a6 Extract username/password digest function 2015-03-22 12:20:16 -05:00
Andrew Brown
6602d8bb26 Log out users with the old style of cookies 2015-03-16 02:53:41 -05:00
Andrew Brown
cea24d8416 Hopefully fix migration json parse 500 2015-03-16 02:40:31 -05:00
Andrew Brown
c2497d5123 Fix non-anon users sometimes seeing anon banner #366 2015-03-14 01:31:47 -05:00
Andrew Brown
50944c3727 Fix some tests 2015-03-14 01:29:17 -05:00
Andrew Brown
3fd6d604fe Revert "Revert "Resolve merge with master"" 
This reverts commit 6f8ae925ba.

Conflicts:
	app/assets/stylesheets/bootplus_overrides.css.less
 2015-03-13 22:46:31 -05:00
Robert Richter
6f8ae925ba Revert "Resolve merge with master" 
This reverts commit 8524963f1c12d6f4667964acc16680749dec20cf, reversing
changes made to bdb208e18769be9ea95c06d54c72f86d2d6a0209.
 2015-03-13 20:18:49 -05:00
Robert Richter
1cab3282ff Add all the remaining tests and code to get the site functional 2015-03-13 20:15:54 -05:00
Robert Richter
b91b53412e Created Languages controller tests, and updated Languages controller to use Rails 4 strong parameters 2015-03-13 20:14:47 -05:00
Robert Richter
e661f692a9 Create equipment controller tests and update Equipment controller to use Rails 4 strong parameters 2015-03-13 20:14:46 -05:00
Robert Richter
ccad5e6d1f Fix Character model and tests 2015-03-13 20:14:06 -05:00
Robert Richter
d0192b47a6 Create Character tests 2015-03-13 20:14:06 -05:00
Andrew Brown
06c6b0ce89 Merge resolution 2015-03-13 20:12:42 -05:00
Andrew Brown
8dca1c72af Use location paths on location#edit, not character paths 2014-10-23 03:33:04 +00:00
Andrew Brown
1140037f3d Do not double-hash user passwords #378 2014-08-03 19:44:31 -05:00
Andrew Brown
693edc0790 Reset anon user flag on successful logins #366 2014-08-03 03:58:22 +00:00
Andrew Brown
bc9746bdc8 add my_content helper for getting content owned by currently-logged-in user 2014-03-14 20:47:29 +00:00
Andrew Brown
963567ec77 move pickers to their own helper and dear god remove a little of that duplicated code 2014-03-14 20:39:58 +00:00
Andrew Brown
e0a1bf4fe6 tie magic to universe + show it on universe#show 2014-01-09 14:57:03 +00:00
Andrew Brown
632a8ded0b location pairing with universe + showing on universe#show 2014-01-09 14:48:10 +00:00
Andrew Brown
02556afe32 allow languages to be tied to a universe 2014-01-09 14:25:21 +00:00
Andrew Brown
6f67d6488c fix privacy restrictions 2014-01-09 14:17:44 +00:00
Andrew Brown
cde90ead99 let equipment be tied to a universe 2014-01-09 14:01:36 +00:00
Andrew Brown
34e08d3705 show character list on universe page of chars in that universe 2014-01-09 13:51:02 +00:00
Andrew Brown
70c7cb1439 hide private content, allow #show on public content 2014-01-09 03:04:11 +00:00
Andrew Brown
609f19bb6f catch heroku resetting connection on long uploads and continue without the upload 2014-01-08 21:21:41 +00:00
Andrew Brown
3b30afc154 don't create anon accounts until content is actually created 2013-12-09 14:38:29 -06:00
Andrew Brown
f0f6062f25 do away with forced-accounts and create them on the fly when users make stuff 2013-12-08 21:43:23 -06:00
Andrew Brown
5c6ac87cbb skeleton page for attribution 2013-12-08 14:15:30 -06:00
Andrew Brown
fc51cbc4b4 fix sizing on magic appearance tab long-form content fields 2013-04-21 21:53:00 -05:00
Andrew Brown
e31bea922a add more possible races 2013-04-21 04:03:44 -05:00
Andrew Brown
5a202933c4 ton of weapon/character/armor api endpoints 2013-04-21 03:35:21 -05:00
Andrew Brown
dd9e05e727 add more api generator endpoints 2013-04-21 02:05:44 -05:00
Andrew Brown
8aedfc7dd1 redirect to signup page, not login page 2013-03-11 03:17:03 -05:00
Andrew Brown
a03a10e135 anon info page 2013-03-10 23:11:17 -05:00
Andrew Brown
e17cf877ed onboarding process from anon account to real account 2013-03-10 22:40:48 -05:00
Andrew Brown
ce79faa660 escape nasty html and give index columns widths 2013-03-10 20:32:32 -05:00
Andrew Brown
bc668ca53e remove diana from location name gneerator 2013-03-04 02:07:35 -06:00
Andrew Brown
60b1ea39f6 remove space in location name generator 2013-03-04 01:00:15 -06:00
Andrew Brown
7404bd63e6 password hashing (finally) 2013-03-03 20:14:37 -06:00
Andrew Brown
c38ff6222e location name generator 2013-03-03 17:38:54 -06:00
Andrew Brown
95fcab50fb random character age generation 2013-03-03 16:40:51 -06:00
Andrew Brown
aa84b7070a name randomization for characters 2013-03-03 16:30:59 -06:00
Andrew Brown
28f5dcc7e6 random name generator 2013-03-03 02:52:58 -06:00
Andrew Brown
42de9c3c0d don't throw an error when filtering universe and no characters exist{ 2013-02-25 22:26:00 -06:00
Andrew Brown
f785c9d6f9 redirect from homepage to dashboard if logged in 2013-02-25 22:21:52 -06:00
Andrew Brown
3f1ed219c6 redirect to dashboard on login 2013-02-25 21:28:51 -06:00
Andrew Brown
ffb167f0f5 initial nonlinking stats on dashboard 2013-02-25 21:27:19 -06:00
Andrew Brown
0010b08557 add dashboard page 2013-02-25 21:18:17 -06:00
Andrew Brown
afe8630478 add nl2br 2013-02-25 19:12:53 -06:00
Andrew Brown
793db6be28 allow people to log in anonymously 2013-01-22 19:40:30 -06:00
Andrew Brown
e8bf589cc6 show selected universe name in filter 2013-01-21 23:44:24 -06:00
Andrew Brown
dc52c90d75 remove characters from universes 2013-01-10 03:43:16 -06:00
Andrew Brown
dd4a38c650 assign characters to universes 2013-01-10 03:10:43 -06:00
Andrew Brown
5ab1567a4c make filter select work on character selection page 2013-01-10 02:49:20 -06:00
Andrew Brown
7f8b3c401d filter characters by universe 2013-01-10 02:38:25 -06:00
Andrew Brown
42721e3a3d add universes 2013-01-10 02:05:55 -06:00
Andrew Brown
54bd06f35f magic is here 2013-01-01 23:04:47 -06:00
Andrew Brown
21cd7f9f04 don't show empty pickers 2013-01-01 21:22:45 -06:00
Andrew Brown
a1eccc7da9 omg pickers work 2013-01-01 20:57:14 -06:00
Andrew Brown
9a70863fe7 better structure for pickers 2013-01-01 20:15:11 -06:00
Andrew Brown
77336bb096 working picker for character forms 2013-01-01 19:58:48 -06:00
Andrew Brown
15b1202586 languages and locations sorted alphabetically: 2013-01-01 02:29:46 -06:00
Andrew Brown
6119fb5605 display equipment alphabetically 2013-01-01 02:19:35 -06:00
Andrew Brown
c3934f5ca6 sort characters alphabetically 2013-01-01 02:18:30 -06:00
Andrew Brown
30b2e1f583 locations 2012-12-28 00:38:54 -06:00
Andrew Brown
ce1f25fcee languages 2012-12-27 23:25:32 -06:00
Andrew Brown
ca8beb18dc languages 2012-12-27 23:18:41 -06:00
Andrew Brown
fd27bed6d8 routes / coming soon pages 2012-12-27 20:36:41 -06:00
Andrew Brown
4b91f4ccdc equipment (exclamation mark) 2012-12-26 23:30:04 -06:00
Andrew Brown
e045883840 wtf when did it get 7am 2012-12-24 06:49:42 -06:00
Andrew Brown
3f1393ea8f login/signup/anon page updated with tabs 2012-12-24 05:25:06 -06:00
Andrew Brown
f96c9d2abd characters bootstrapped 2012-12-24 00:18:50 -06:00
Andrew Brown
393ce2b6e4 bootstrapped user 2012-12-23 23:23:00 -06:00
Andrew Brown
9719d4ebc2 Validations on user signup 2012-12-23 22:33:59 -06:00
Andrew Brown
4cddbd3c2c fixed user redirection stuff 2012-12-23 20:35:16 -06:00
Andrew Brown
860a83e90f proper routes and links 2012-12-23 19:59:38 -06:00
Andrew Brown
8f587c75f2 restrict seeing characters only to owners 2012-12-23 19:44:59 -06:00
Andrew Brown
722d742266 character creation requires user to be logged in 2012-12-23 18:10:03 -06:00
Andrew Brown
34689fa706 characters scaffolding 2012-12-23 17:42:28 -06:00
Andrew Brown
d410015fdc bulletproofing 2012-12-23 03:09:32 -06:00
Andrew Brown
0c4ecfda64 forgot a word 2012-12-23 02:42:37 -06:00
Andrew Brown
268b1bc7b9 main controller and misc changes 2012-12-23 02:32:39 -06:00
Andrew Brown
d00045eedf started drinking 2012-12-22 23:50:10 -06:00
Andrew Brown
69110c64e9 users scaffold 2012-12-22 20:24:25 -06:00
Andrew Brown
bb7c5eeee4 rails app 2012-12-22 17:39:34 -06:00