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

808 Commits

Author SHA1 Message Date
Andrew Brown
7d93a5e5b3 wrap up customization page 2018-12-11 19:44:02 -06:00
Andrew Brown
f19775b2bd add hex colors + redesign content_types page 2018-12-11 18:40:08 -06:00
Andrew Brown
fdd33ee586 don't duplicate categories/fields of old-style links on #new 2018-12-07 21:04:04 -06:00
Andrew Brown
a08df44f59 clean up unused code 2018-12-04 12:55:35 -06:00
Andrew Brown
c16d5e8e15 whoops 2018-12-03 23:12:39 -06:00
Andrew Brown
3a7adb6e59 links are being duplicated. no longer! 2018-12-03 22:55:24 -06:00
Andrew Brown
603f0d29f4 include all fields 2018-12-01 17:30:08 -06:00
Andrew Brown
da824f0da9 add CAF serializer for #new page 2018-11-27 05:39:07 -06:00
Andrew Brown
dab47b8e01 universe serialization fixes 2018-11-27 04:55:49 -06:00
Andrew Brown
d321c1acc2 polish 2018-11-24 21:00:24 -06:00
Andrew Brown
25e4458802 field ordering / move links to end 2018-11-24 20:40:05 -06:00
Andrew Brown
c825fd2cdc fix old-style links in new caches 2018-11-24 20:23:52 -06:00
Andrew Brown
6db9a57ead use serialized content model on edit page 2018-11-23 19:11:59 -06:00
Andrew Brown
38172254d9 use content serializer on content#show 2018-11-23 10:48:49 -06:00
Andrew Brown
c75977c754 add ContentSerialier for caching attribute system per page load 2018-11-23 09:14:33 -06:00
Andrew Brown
ecd252a1cd Merge branch 'master' into documents 2018-11-14 14:47:42 -06:00
Andrew Brown
d2968c94b0 add missed line 2018-11-10 01:48:19 -06:00
Andrew Brown
5c1dbfd78e icons 2018-11-02 18:52:36 -05:00
Andrew Brown
242200c88b change building color 2018-11-01 21:12:59 -05:00
Andrew Brown
07028caa88 images for the new page types 2018-11-01 21:04:04 -05:00
Andrew Brown
bcf08c7658 colors and icons 2018-11-01 19:41:06 -05:00
Andrew Brown
7d0d2da387 initial fields 2018-11-01 19:26:30 -05:00
Andrew Brown
b578204316 reign the content queries in 2018-11-01 18:19:47 -05:00
Andrew Brown
555cd3d0c6 fill pages 2018-11-01 16:18:55 -05:00
Andrew Brown
f24bf6ea6c ALL the page types 2018-11-01 16:10:10 -05:00
Andrew Brown
ed7fd504cb add Vehicle page type 2018-11-01 16:02:34 -05:00
Andrew Brown
37e889537c polish sidenav color 2018-10-19 00:23:30 -05:00
Andrew Brown
83ee6a095b polish autosaving + #index 2018-10-18 15:48:20 -05:00
Andrew Brown
02d5454bfa allow un-deleting documents 2018-10-18 13:58:52 -05:00
Andrew Brown
18c40cecc7 add deleted_at usage to documents 2018-10-18 13:22:56 -05:00
Andrew Brown
36eab5f4e3 Merge branch 'master' into documents 2018-10-18 13:11:10 -05:00
Andrew Brown
1ab48c1336 fix 2018-10-18 00:19:10 -05:00
Andrew Brown
a5aae5f035 don't query universe.universe_id 2018-10-18 00:15:13 -05:00
Andrew Brown
947d7efb7f Create polymorphic ContentPages 2018-10-17 17:58:48 -05:00
Andrew Brown
8ce85f6eda mad rad optimizations 2018-10-17 16:52:05 -05:00
Andrew Brown
eba5baf0fb optimize user#content_list 2018-10-17 15:21:59 -05:00
Andrew Brown
d80ff65509 document resource stuff 2018-10-01 23:09:42 -05:00
Andrew Brown
2a47e504a4 reuse existing universe query for universe picker 2018-09-24 13:18:27 -05:00
Andrew Brown
dd4dfccd7c a little less optimization on recent pages :( 2018-09-24 13:13:12 -05:00
Andrew Brown
bfbc017e28 optimize recent_content_list 2018-09-24 12:56:03 -05:00
Andrew Brown
6ae67eab3c attribute name cache 2018-09-24 12:55:50 -05:00
Andrew Brown
1d1aaf5e22 more small wins 2018-09-24 12:02:06 -05:00
Andrew Brown
2d0620cad8 little big win 2018-09-24 01:51:48 -05:00
Andrew Brown
d79d7bc3f2 reuse content list cache 2018-09-24 01:42:17 -05:00
Andrew Brown
79e14e764f cut contributor queries in half 2018-09-24 01:33:07 -05:00
Andrew Brown
a7abb3e66f more polish 2018-09-21 13:43:56 -05:00
Andrew Brown
9587b44785 big optimization win + link dropdowns on text fields 2018-09-19 16:08:44 -05:00
Andrew Brown
8629ceb365 fix 404 errors for deleted content in changelogs 2018-09-19 13:06:08 -05:00
Andrew Brown
7705d4cbd0 add initial api controller 2018-09-16 22:59:16 -05:00
Andrew Brown
8a546789d9 add api keys for apps 2018-09-16 22:38:37 -05:00
Andrew Brown
074c4edb8a remove n+1 2018-09-14 08:56:44 -05:00
Andrew Brown
a6be1f5eac few db optimizations 2018-09-14 07:15:20 -05:00
Andrew Brown
ae62403dbe temp 2018-09-11 17:24:27 -05:00
Andrew Brown
5d3e5de033 wooooo found that bug 2018-09-11 17:21:01 -05:00
Andrew Brown
377238944e guess not 2018-09-11 03:42:00 -05:00
Andrew Brown
dc2f883702 try cache again 2018-09-11 03:39:05 -05:00
Andrew Brown
f3bfd604c9 remove debug 2018-09-11 03:28:44 -05:00
Andrew Brown
9606b82e5f remove cache? 2018-09-11 03:21:10 -05:00
Andrew Brown
f6b9efe51a exclude includes 2018-09-11 02:56:03 -05:00
Andrew Brown
6ed4053694 don't save fields/categories when we don't need to 2018-09-11 02:20:50 -05:00
Andrew Brown
08766cda61 includes instead of left outer join 2018-09-11 01:57:25 -05:00
Andrew Brown
c6f820e7e4 fixes from papercut qa 2018-09-11 00:11:47 -05:00
Andrew Brown
4a822c70d1 more optimizations -- hope this works! :) 2018-09-10 17:19:11 -05:00
Andrew Brown
c1e62a8f7f more optimizations 2018-09-10 16:57:09 -05:00
Andrew Brown
d9aa234b60 eager_load attribute fields when we get categories 2018-09-10 15:42:27 -05:00
Andrew Brown
67bbb6fbe8 optimization 2018-09-10 03:00:29 -05:00
Andrew Brown
83eaebdb1f remove duplicate is_public scopes 2018-09-07 20:58:58 -05:00
Andrew Brown
0799c5c48a don't error if we can't find a universe on an #index page 2018-09-05 14:10:20 -05:00
Andrew Brown
928cbe0950 undo permissions changes 2018-09-04 21:20:53 -05:00
Andrew Brown
c769b3e245 fix universe setting 2018-09-04 21:09:47 -05:00
Andrew Brown
173a2a2308 potentially fix universe setting 2018-09-04 19:40:00 -05:00
Andrew Brown
bc163cd312 fix universe creation + universe setting on content pages 2018-09-04 16:12:29 -05:00
Andrew Brown
3b91ad104b allow users to customize category icons with material-icons 2018-09-03 15:04:52 -05:00
Andrew Brown
4fe6953b93 only create change events on attributes now 2018-09-03 13:50:28 -05:00
Andrew Brown
e0c583a426 polish changelog design for attributes 2018-09-03 13:42:39 -05:00
Andrew Brown
eb8c7aeff2 fix changelog mostly 2018-09-03 13:15:15 -05:00
Andrew Brown
556e098022 fix feature tests 2018-08-31 20:34:58 -05:00
Andrew Brown
1a03148cfa fix rspec tests 2018-08-31 19:38:48 -05:00
Andrew Brown
e1490a2920 standins for the other content types 2018-08-31 18:05:51 -05:00
Andrew Brown
46a997695a role stand-in for content#index 2018-08-31 18:01:34 -05:00
Andrew Brown
2a1a3e20d8 disable changelogs for attribute migration 2018-08-31 16:57:50 -05:00
Andrew Brown
27dfba432a fix post-migration category ordering 2018-08-31 14:26:51 -05:00
Andrew Brown
3d13e9ae4f fix changelogs 2018-08-28 01:07:07 -05:00
Andrew Brown
4a00731bb4 universe field 2018-08-25 18:15:10 -05:00
Andrew Brown
3a09363977 more db indices 2018-08-24 19:41:35 -05:00
Andrew Brown
f74677bf71 disable links from migration 2018-08-24 18:02:19 -05:00
Andrew Brown
94ffab3ab3 exclude links from migration for now 2018-08-24 13:44:12 -05:00
Andrew Brown
83e0080db6 fix sidelinks for hidden categories 2018-08-18 16:55:15 -05:00
Andrew Brown
fe3ce777ee deletion logic 2018-08-18 16:49:17 -05:00
Andrew Brown
fb1ebdcb50 create default pages if not existing + toggleable hiddens 2018-08-18 15:43:27 -05:00
Andrew Brown
cfa5cf18f7 upgrade thor 2018-08-16 11:28:49 -05:00
Andrew Brown
b3728f39be add page customization page 2018-08-16 10:58:21 -05:00
Andrew Brown
dab5d5f0ea Merge branch 'master' into rails5-upgrade 2018-08-15 16:31:37 -05:00
Andrew Brown
0e37ee36cf :((((((((((((((( 2018-07-21 18:48:06 -05:00
Andrew Brown
43528f6f61 Link deities to religions 2018-07-21 18:06:58 -05:00
Andrew Brown
a5784576b6 Add deity link to religions 2018-07-15 13:52:40 -05:00
Andrew Brown
1a666a9654 oops 2018-07-05 01:19:03 -05:00
Andrew Brown
59904a861d rails 5 prep 2018-07-05 01:10:52 -05:00
Andrew Brown
ee06aa29d2 subscriptions refactor 2018-03-03 16:49:08 -06:00
Andrew Brown
d9e4ccd500 Add race link to deity 2018-02-02 00:45:00 -06:00
Andrew Brown
7a5873603d Add deity and character siblings to deities 2018-02-02 00:19:14 -06:00
Andrew Brown
1b55a04c09 smart relations for planets/technology 2018-02-01 17:54:47 -06:00
Andrew Brown
80328354e9 cleanup 2018-01-31 21:56:21 -06:00
Andrew Brown
a25d67a6ef context cards for everyone 2018-01-31 15:57:06 -06:00
Andrew Brown
3ac56861d4 add requested relations 2018-01-31 00:39:08 -06:00
Andrew Brown
b0035ffdbe add magic link to items 2018-01-31 00:21:36 -06:00
Andrew Brown
a4ec437b06 new relations on locations 2018-01-31 00:18:32 -06:00
Andrew Brown
963c942779 new character relations 2018-01-31 00:09:15 -06:00
Andrew Brown
fdca8babe9 hook up deity, gov, and technologies relations 2018-01-30 23:47:44 -06:00
Andrew Brown
6969397b01 finalize planet relations 2018-01-30 22:53:34 -06:00
Andrew Brown
9f000bb7c0 relates definitions 2018-01-30 22:36:00 -06:00
Andrew Brown
346f2839be move content groupers 2018-01-30 17:54:30 -06:00
Andrew Brown
f80df7ff61 add deity relation models 2018-01-30 17:44:59 -06:00
Andrew Brown
a174f2d88c add technology relation models 2018-01-30 17:43:10 -06:00
Andrew Brown
162e7c5d1b add planet relations 2018-01-30 17:38:33 -06:00
Andrew Brown
4f8d8574d9 page type icons/colors 2018-01-28 21:02:10 -06:00
Andrew Brown
9060f37e2a Sort sidebar premium pages alphabetically 2018-01-27 15:01:41 -06:00
Andrew Brown
55e7b9bfa9 Add government preconf 2018-01-27 14:32:43 -06:00
Andrew Brown
07e586d34c Add technology and deity 2018-01-27 14:22:36 -06:00
Andrew Brown
81c554450f Add Planet pre-configuring 2018-01-27 14:05:28 -06:00
Andrew Brown
12e20d7a24 Clean up export and frame planet page type 2018-01-27 13:47:54 -06:00
Andrew Brown
32a062e122 prep page create script 2018-01-27 13:19:25 -06:00
Andrew Brown
4c7d1ac9ab dep destroy on referral codes 2018-01-23 01:13:54 -06:00
Andrew Brown
7c30e867ce don't query for universe in univeres 2018-01-23 01:01:04 -06:00
Andrew Brown
5dc4794a60 cleanup 2018-01-23 00:09:55 -06:00
Andrew Brown
859a9d56f8 fix user relation dependencies 2018-01-22 23:52:48 -06:00
Andrew Brown
a1710c7494 clear universe_id on related content after deleting a universe 2018-01-21 13:01:33 -06:00
Andrew Brown
a8ec970240 clean up deleted_at hacks 2018-01-20 12:53:56 -06:00
Andrew Brown
1d2ea3a3bd re-enable paranoid on content types 2018-01-20 11:58:21 -06:00
Andrew Brown
e67688f6b3 re-enable recent content 2018-01-19 22:23:15 -06:00
Andrew Brown
81e0f5797a local cleanup 2018-01-19 21:42:44 -06:00
Andrew Brown
71fcf17e16 re-enable paranoia on users 2018-01-19 21:41:38 -06:00
Andrew Brown
37f37290fb optimize for speed in sidebar counts 2018-01-19 21:14:23 -06:00
Andrew Brown
04856d105d removes aap 2018-01-19 18:54:29 -06:00
Andrew Brown
1c77b607a5 caching opts 2018-01-16 00:39:15 -06:00
Andrew Brown
de4276b2af recent content list opts 2018-01-15 23:26:35 -06:00
Andrew Brown
e95684437e remove redundant public scopes 2018-01-11 22:43:38 -06:00
Andrew Brown
81bf57debc include link to new blog post about privacy: 2018-01-10 16:46:52 -06:00
Andrew Brown
ee1de0bcf8 move LandmarkCreature relation to proper directory 2018-01-09 23:05:03 -06:00
Andrew Brown
aef7b3188f
Merge branch 'master' into stripe-webhooks 2018-01-07 13:23:48 -06:00
Ahmad Saleem
0702d18daa Add table to store stripe event logs. 2018-01-07 23:45:10 +05:00
Andrew Brown
9416b67f80 include placeholder universe id of 0 for users with no universes 2018-01-06 21:13:51 -06:00
Andrew Brown
04f8a89b4a Include contributable content in linked lists 2018-01-06 20:49:30 -06:00
Andrew Brown
7ce304e7eb don't overwrite username with blank if not set on update 2018-01-01 18:59:35 -06:00
Andrew Brown
8974a789eb remove unnecesary scope 2018-01-01 16:26:50 -06:00
Andrew Brown
40e4473827 Hook up relations on new location types 2018-01-01 15:05:18 -06:00
Andrew Brown
cab9d0ca51 Add and hook up town/country/landmark 2017-12-31 15:56:33 -06:00
Andrew Brown
e0e0fea6e6 add models for Country, Town, and Landmark 2017-12-31 11:44:53 -06:00
Andrew Brown
74854784cf content type magic constant cleanup 2017-12-28 16:39:01 -06:00
Andrew Brown
720659cbe0 create content activators for new accounts 2017-12-27 12:25:05 -06:00
Andrew Brown
e0b83eefa3 Create user content type activators 2017-12-27 12:22:13 -06:00
Andrew Brown
0f33c98d29 fix forums permission 2017-12-26 21:38:44 -06:00
Andrew Brown
05de8b7ef7 blowin up 2017-12-26 16:35:34 -06:00
Andrew Brown
9bd8469c33 hack for 500s 2017-12-26 16:33:53 -06:00
Andrew Brown
049b59ac15 Add 'love interest' linked field to characters 2017-12-26 15:44:35 -06:00
Andrew Brown
f626b65d53 redesign account info page 2017-12-26 15:01:23 -06:00
Andrew Brown
50070c4a9f Add soft deletion to users and all content models 2017-12-26 14:37:09 -06:00
Andrew Brown
1d3363b6d0
Merge branch 'master' into issue#190 2017-11-24 14:30:15 +01:00
Andrew Brown
1593fbf484 Use AttributeAuthorizer for attributes, attribute fields, and attribute categories 2017-11-09 19:12:44 +02:00
Andrew Brown
77f8fee363
Merge branch 'master' into issue#190 2017-11-09 17:23:47 +01:00
Andrew Brown
5b2f0a064d prepend forum usernames with @ 2017-10-29 02:00:56 +03:00
Andrew Brown
4e8d1ba9b8 Merge branch 'master' into thredded 2017-10-28 21:10:24 +03:00
Babu Thomas
1cfa3aa658 Delete mothership objects when deleting characters 2017-10-21 21:03:47 +05:30
Babu Thomas
f82590983e Delete siblingship objects on character deletion 2017-10-20 13:30:16 +05:30
Andrew Brown
aa1b86a908 Merge branch 'master' of github.com:indentlabs/notebook 2017-10-19 02:35:16 +03:00
Andrew Brown
0c26361027 Delete contributor objects when deleting universes 2017-10-18 15:09:37 +03:00
Jorge Luiz
ea6ac42e75 Removed own email validation to avoid duplicate error messages 2017-10-17 23:47:44 -02:00
Andrew Brown
51249a447e Don't try to delete siblings if they've already been deleted 2017-10-17 21:43:26 +02:00
Andrew Brown
617391366a De-dupe contributable content from dashboard content counts 2017-10-08 23:51:58 +02:00
Andrew Brown
baf7d2795d Make everything free 2017-10-02 18:26:21 +02:00
Andrew Brown
eba5096129 Require user presence on universe 2017-10-01 12:23:52 +02:00
Andrew Brown
577de5f447 Merge branch 'master' into thredded 
Conflicts:
	db/schema.rb
 2017-09-30 15:44:27 +02:00
Andrew Brown
0e972c186b we're legitimate hackers now 2017-08-17 03:28:55 +02:00
Andrew Brown
dfdc958ab8 it'll all be over soon 2017-08-17 02:35:38 +02:00
Andrew Brown
32cd18c7cf helper methods for contributable content types 2017-08-17 02:04:22 +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
0022adb953 Contributor invite flow #migration 2017-08-15 01:41:43 +02:00
Andrew Brown
1e38b4e0e6 Add floras relation to universe 2017-07-31 15:25:08 +02:00
Andrew Brown
3540d6f11d minor scope bug 2017-07-31 04:03:17 +02:00
Andrew Brown
60b599b8e8 Flora strings and i18n 2017-07-31 03:59:52 +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
63d4c442cc Add content changelogs #migration 2017-07-14 13:36:32 +02:00
Andrew Brown
7df4137f52 fix line breaks on voting page 2017-05-19 15:51:48 +00:00
Andrew Brown
6eb2e08102 Add scratchpad page and update sidebar design #migration 2017-05-17 16:54:30 +01:00
Andrew Brown
adcea851f4 Add babel translation app 2017-05-01 15:35:03 +01:00
Andrew Brown
efe33b445d Dynamically store relations on content classes 2017-05-01 00:36:59 +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
c3b00257a2 Voting MVP 2017-04-17 16:22:02 +01:00
Andrew Brown
88a0d973b2 Add votable and votes 2017-04-15 20:26:15 +01:00
Andrew Brown
29d7a203d4 Add SecureCode to all users 2017-04-15 19:38:00 +01:00
Andrew Brown
ce6dda81b6 Add worldbuilding prompts page 2017-04-11 17:47:47 +01:00
Andrew Brown
3a0617b144 Subscription page redesign design 1? 2017-04-03 20:45:17 +01:00
Andrew Brown
a63afd71fc Integrate referral codes with signup #migrations 2017-04-03 19:10:05 +01:00
Andrew Brown
29395d276a Add user referral codes 2017-03-31 01:23:09 +01:00
Andrew Brown
7e782f7c40 Add languages link to locations 2017-03-26 17:44:52 +01: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
a8e0382a3e Fix de-linking marriages :( 2017-03-01 15:51:10 +00:00
Andrew Brown
d3ae7523dd Make sistergroups reciprocal and build opposite subgroup/supergroup links 2017-03-01 14:49:56 +00:00
Andrew Brown
9b02da6e45 Make Group allies, enemies, and rivals reciprocal links 2017-03-01 14:41:21 +00:00
Andrew Brown
da57291546 Show content images on the dashboard if they exist... SOMETIMES 2017-02-28 22:26:29 +00:00
Andrew Brown
28b564491f Infer gender from children relations, set father/mother relations 2017-02-28 18:51:17 +00:00
Andrew Brown
44b2be38bd Adding a mother creates 2way child association 2017-02-28 17:30:11 +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
64fb923ae9 Two-way relationship deletes working also 2017-02-28 15:38:49 +00:00
Andrew Brown
d7e37a1d7a WIP two-way links 2017-02-27 17:37:59 +00:00
Andrew Brown
c897aeb915 Two-way links on Character siblings 2017-02-24 18:33:34 +00:00
Andrew Brown
eb934ba59d WIP dashboard designs 2017-02-23 23:05:47 +00:00
Andrew Brown
fff5abf02e Style share modal 2017-02-23 14:41:02 +00:00
Andrew Brown
041813d8e2 WIP design tweaks for dashboard and content#show pages 2017-02-21 20:01:45 +00:00
Andrew Brown
963769e3c9 Add mixpanel action tracking for all server actions 2017-02-21 17:12:43 +00:00
Andrew Brown
db1edb48f6 Enable image uploads on all content 2017-02-20 16:05:16 +00:00
Andrew Brown
1cf19aea75 Polishing gallery ui 2017-02-18 00:36:16 +00:00
Andrew Brown
ee13d748f3 Fix image destroy callback 2017-02-18 00:26:58 +00:00
Andrew Brown
b211f7974f Style gallery edit partial 2017-02-17 23:29:49 +00:00
Andrew Brown
ee5fe081e7 Store modified image styles properly, e2e uploads tested 2017-02-17 22:07:25 +00:00
Andrew Brown
f2053b3ae0 Hook up frontend to allow multiple file uploads 2017-02-17 18:54:36 +00:00
Andrew Brown
737273d2ae Single image uploading, needs processing in controller 2017-02-17 01:41:41 +00:00
Andrew Brown
eec596133b Add ImageUpload model 2017-02-16 21:20:55 +00:00
Andrew Brown
77245b53e1 HasImageUploads concern for content 2017-02-16 20:31:44 +00:00
Andrew Brown
099b252e8e Add gallery tab to characters 2017-02-16 20:04:18 +00:00
Andrew Brown
3d502314e0 Treat attributes like core content: available to everyone 2017-02-02 22:43:23 +00:00
Andrew Brown
863116d8e4 Don't create stripe customers in test env :( 2017-01-25 16:45:33 +00:00
Andrew Brown
c6c34c5ac7 Rake task to add default stripe customers to all existing users 2017-01-23 15:33:49 +00:00
Andrew Brown
81b26c2505 Add stripe + initialize stripe customers on user create 2017-01-23 15:22:58 +00:00
Andrew Brown
c8502f1737 Methods for fetching active subscriptions and billing plans on users 2017-01-21 16:38:50 +00:00
Andrew Brown
6a8bebd01c Merge branch 'master' into authority 
Conflicts:
	app/models/user.rb
 2017-01-21 16:21:46 +00:00
Andrew Brown
16f58c81cb Clean up User model with has_content concern 2017-01-21 16:20:59 +00:00
Andrew Brown
1ec58d3b7b Model for subscriptions #migration 2017-01-20 21:48:05 +00:00
Andrew Brown
0434242a94 BillingPlan model #migration 2017-01-20 21:45:39 +00:00
Andrew Brown
8ae77f4b67 Implement authority for user permissions 2017-01-14 00:06:33 +01:00
Andrew Brown
48cf0a2ea5 Scope content linking dropdowns to universe when scoped 2016-11-06 15:48:23 +01:00
Andrew Brown
9451c60d6f Add group memberships and locations 2016-11-02 21:35:41 +01:00
Andrew Brown
efd4181972 Fix text data export 2016-11-02 14:00:18 +01:00
Andrew Brown
9e3b12bc6b Add new content types to user content count 2016-11-02 13:49:38 +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
eb243b3281 remove unnecessary associations 2016-10-31 16:59:18 -07:00
Matthew Werner
72c66a60cb Attribute Field Dropdowns 2016-10-31 16:32:41 -07:00
Andrew Brown
4fbbbce411 Fix privacy fields on new content types 2016-10-30 02:33:59 +02:00
Andrew Brown
46b2d3f2ee Update tab icons for all content types 2016-10-27 00:51:37 +02: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
59608693a7 Add data migrations for english languages and human races 2016-10-24 22:43:12 +02:00
Andrew Brown
3a0f23b3e1 Add magic relations, add spoken language relation to characters 2016-10-24 22:30:38 +02:00
Andrew Brown
657be159c7 Minor dashboard/sidebar styling 2016-10-24 15:10:31 +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
a72a70c893 Fix religion form 2016-10-21 15:25:47 +02:00
Andrew Brown
8dd30d181e Link creatures to Location habitats 2016-10-21 13:53:55 +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
275ab75355 Add religion as a content type 2016-10-15 00:46:46 +02:00
Andrew Brown
ddc3f378d5 Content type model organization 2016-10-15 00:33:26 +02:00
Andrew Brown
3440db3b5e Add race as content type 2016-10-15 00:15:36 +02:00
Andrew Brown
9e4f991198 Earthquake cleanup 2016-10-14 23:39:32 +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
b983fb36ad more small adjustments 2016-10-10 23:21:43 -07: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
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
b0b57e2e40 Don't prepopulate author name to 'Anon author' on signup 2016-10-05 12:42:51 +02:00
Andrew Brown
6f381c889d Merge branch 'master' into achetype 
Conflicts:
	db/schema.rb
 2016-10-04 00:16:56 +02:00
Ashley Sullins
eb281b6165 Add archetype to character information 2016-10-02 22:24:52 -05:00
Andrew Brown
7e8c60bbe0 Add 'past owners' relation on items 2016-10-02 01:41:31 +02:00
Andrew Brown
8ab97e7ea6 author page polish 2016-10-01 17:35:59 +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
96be59d85b dashboard, footer, and misc polish 2016-09-29 21:35:43 +02:00
Andrew Brown
ff5314732f Content show/edit pages polish 2016-09-29 15:58:30 +02:00
Andrew Brown
b4c2dc1cb3 Dashboard polish 2016-09-29 14:58:42 +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
Andrew Brown
2978c38102 Replace sharing toggles with an info message for content visitors 2016-09-23 23:33:11 +02:00
Andrew Brown
c0d645c79f Merge branch 'master' into issue-15 2016-09-23 22:58:35 +02:00
Robert Richter
225425cc79
Use parameterized queries 2016-09-22 17:13:03 -05:00
Robert Richter
aa46434f09
Make is_public scopes use new OR logic 2016-09-22 16:47:40 -05:00
Robert Richter
7cae32a3e9
Add privacy to items and locations 2016-09-22 16:06:21 -05:00
Robert Richter
8706cf9109
Change is_public logic 
Previously, Universe privacy was checked first. If it was private, then
any content within it was private. If it was public, only then would
the content's privacy be checked.

Now, both values are checked in an OR comparison. If either the universe
or content privacy is "public," then the content is public.
 2016-09-22 15:30:56 -05:00
Robert Richter
bb9edc1377
Merge branch 'master' into issue-15 2016-09-22 13:15:56 -05:00
Robert Richter
2809c3c60a
Add back is_public scope 2016-09-22 13:03:10 -05:00
Robert Richter
bf3cf4a51e
Add HasPrivacy concern 2016-09-22 13:02:03 -05:00
Robert Richter
59e4ca8164
Allow specifying a size for user image 2016-09-21 21:11:09 -05:00
Robert Richter
6475d52a56
Add a default name to users 2016-09-21 21:08:59 -05:00
Robert Richter
801a5fd55f
Add user avatar to User page metadata 2016-09-21 20:37:44 -05:00
Robert Richter
d34b99f9ea
Make Gravatars identicons by default 2016-09-21 20:35:03 -05:00
Robert Richter
f17891b14d
Add image_url property to User 2016-09-21 20:21:52 -05:00
Robert Richter
0487cc09b2
Extract blacklisted User attributes into a method 2016-09-21 11:44:08 -05:00
Robert Richter
9218e97441
Add privacy field to Character 2016-09-20 13:08:41 -05:00
Robert Richter
b17f3fb108
Remove pragmatic_context from Universes 2016-09-06 18:50:42 -05:00
Robert Richter
472bb6125a
Remove pragmatic_context from User 2016-09-06 18:43:18 -05:00
Robert Richter
b817cdf1fe
Add JSON-LD to Universes 2016-09-06 10:36:16 -05:00
Robert Richter
ccc2aeef24
Add JSON LD blocks to User pages 2016-09-06 10:23:05 -05:00
Andrew Brown
8e2f095f91 Link from content pages to author profiles 2016-09-06 00:01:01 -05:00
Andrew Brown
6b9c1bf9c5 Add author profile mvp 2016-09-05 23:48:06 -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
Robert Richter
af7af4a3e2
Rubocop auto-correct 2016-08-26 14:56:52 -05:00
Andrew Brown
8f6cc0ee3a Properly show universe content from within universe#show page 2016-08-19 00:44:16 -05:00
Andrew Brown
f2eab8daf3 Allow linking locations and items to universes 2016-08-06 02:29:24 -05:00
Andrew Brown
76be39d214 Allow specifying children of a character 2016-08-06 01:36:24 -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
534c9519e1 Start getting build closer to passing 
Also updated URLs to point to new org repo.
 2016-07-05 17:47:47 -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
c39a644aff ContentGroupers concern 2016-05-03 14:23:28 -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
c0df16d7e0 Add content groupers / organize models 2016-05-03 12:57:00 -05:00
Andrew Brown
4300bf492a Edit siblingships/relations from #_form 2016-05-02 19:37:37 -05:00
Andrew Brown
344ac20fb7 Relation autocomplete tweaking 2016-04-30 15:14:08 -05:00
Andrew Brown
c611022f1d Recognize associations on content#edit 2016-04-30 12:21:32 -05:00
Andrew Brown
b065cd8908 Link to siblings in Character#show 2016-04-29 16:11:02 -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
8a89519c5e Content#edit restyling with tabs 2016-04-27 18:29:57 -05:00
Andrew Brown
0fc8585127 Content#show restyling with tabs 2016-04-27 17:13:53 -05:00
Andrew Brown
9719fdbeed cleanup 2016-04-27 16:22:12 -05:00
Andrew Brown
afcb02036e clean up redundancy 2016-04-07 02:30:38 -05:00
Andrew Brown
e56fddeeac Index and sidebar revamps for all 2016-04-07 00:35:50 -05:00
Andrew Brown
8cb416c04b shows and forms for everything 2016-04-07 00:06:15 -05:00
Andrew Brown
467cf6e33d Abstract new/edit forms to content model 2016-04-06 23:30:14 -05:00
Andrew Brown
d1295ef243 ponr: replace custom login with devise login 2016-04-06 15:04:06 -05:00
Andrew Brown
c5564968fd Add devise 2016-04-04 22:58:47 -05:00
Andrew Brown
6ad0acf524 Start abstracting index views 2015-09-03 22:11:33 -05:00
Andrew Brown
8f88d28c0e Rubocopification 2015-09-01 20:27:07 -05:00
Andrew Brown
47377f1d40 ApplicationHelper simplification 2015-08-28 01:00:58 -05:00
Robert Richter
3df0ff50e1 Migrate to built-in ActiveModel secure passwords 2015-04-19 19:29:42 -05:00
Robert Richter
9683f67ad0 Change regex to use %r{}, as per RuboCop 2015-04-19 19:26:28 -05:00
Robert Richter
47e8e4b057 Fix reference to self 2015-03-29 11:27:54 -05:00
Robert Richter
6fdefcd3a9 Extract NilsBlankUniverse concern 2015-03-29 11:26:10 -05:00
Robert Richter
d939d5bd44 Clean style of Model classes 2015-03-28 12:11:37 -05:00
Robert Richter
a6728af397 Clean style in the EquipmentController 2015-03-27 18:20:29 -05:00
Robert Richter
636c020f85 Make Character set a blank Universe value to nil 2015-03-26 18:14:36 -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
b5668aa1a9 Revert "Comment out some validations for import" 
This reverts commit 90ee3cc136.
 2015-03-16 17:19:27 -05:00
Andrew Brown
90ee3cc136 Comment out some validations for import 2015-03-16 00:50:11 -05:00
Robert Richter
12ea8f8b48 Include fix for #378 2015-03-13 20:15:54 -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
a02ab0e735 Add tests for validations, and the validations as per schema 2015-03-13 20:14:47 -05:00
Robert Richter
c251f50f2b Create tests for models, and add associations to models 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
1140037f3d Do not double-hash user passwords #378 2014-08-03 19:44:31 -05:00
Andrew Brown
ed419d6865 Change card title when switching facets 2014-07-28 22:04:36 -05:00
Andrew Brown
d1574fe08d add private notes field to magic 2014-01-09 17:39:17 +00:00
Andrew Brown
1b4d7956b0 add private notes to locations model 2014-01-09 17:30:04 +00:00
Andrew Brown
5096de4261 add private notes to equipment 2014-01-09 17:20:11 +00:00
Andrew Brown
68e1c92258 add private notes to characters 2014-01-09 17:16:09 +00:00
Andrew Brown
7e09c0f16d add notes and private notes to universes 2014-01-09 17:04:42 +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
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
294a282aff let users specify a privacy setting on universes 2014-01-09 02:41:35 +00:00
Andrew Brown
f715fe1f8d add placeholder map if user doesn't upload one 2014-01-08 19:55:33 +00:00
Andrew Brown
39b6cdddce Squashed commit of the following: 
commit 98cce1cece
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 22:32:13 2014 +0000

    precompile assets

commit 5d8ee6b0b9
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 22:30:10 2014 +0000

    show map on location page

commit 0bbbf65be6
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 22:18:43 2014 +0000

    upload + read works oh god that took long enough

commit 8ca38110d3
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:48:23 2014 +0000

    halve the number of transformations needed on map uploads

commit 866ad0f32c
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:48:03 2014 +0000

    add aws credentials to dev environment

commit f55dc796fa
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:34:20 2014 +0000

    imagemagick gem for image resizing

commit 666e7ac260
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:18:55 2014 +0000

    add dev s3 bucket for testing

commit 9984a475e8
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:17:45 2014 +0000

    add upload form to locations#new

commit 72ed656e82
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:05:25 2014 +0000

    use mongoid-paperclip instead of paperclip

commit 01204e1443
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 19:00:38 2014 +0000

    add attached_file property to location model

commit 3097be4a5a
Author: Andrew Brown <drusepth@gmail.com>
Date:   Tue Jan 7 18:58:25 2014 +0000

    set paperclip aws config
 2014-01-07 22:48:06 +00:00
Andrew Brown
86de62a5fd move universe history to its own tabas per #147 2013-12-10 21:28:42 -06:00
Andrew Brown
143d5f28a9 add facial hair field to character 2013-04-21 02:08:02 -05:00
Andrew Brown
2743fa5d51 add history field to universe, fix sizing of long-form 2013-04-20 17:59:49 -05:00
Andrew Brown
bd3489ffda add long-form background field under history tab (issue #109) 2013-04-20 17:44:02 -05:00
Andrew Brown
cf5e75e970 notes on all models but universe 2013-03-11 23:43:51 -05:00
Andrew Brown
e7ed81f5f2 omg finally fixed #4 2013-03-11 19:22:03 -05:00
Andrew Brown
e17cf877ed onboarding process from anon account to real account 2013-03-10 22:40:48 -05:00
Andrew Brown
39cd1dbc0f Recalculate pw hash whenever user is modified 2013-03-04 02:06:26 -06:00
Andrew Brown
7404bd63e6 password hashing (finally) 2013-03-03 20:14:37 -06:00
Andrew Brown
da32014f2a content func in user model 2013-03-03 02:19:13 -06:00
Andrew Brown
9a7e4129c6 see content of users with model functions 2013-02-26 02:07:37 -06:00
Andrew Brown
5344da8943 add description to locations, move location to geography section 2013-02-03 19:08:46 -06:00
Andrew Brown
bd086ca19f add more fields to magic 2013-01-22 22:06:09 -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
58a18fc406 remove comment 2013-01-01 14:53:12 -06:00
Andrew Brown
30b2e1f583 locations 2012-12-28 00:38:54 -06:00
Andrew Brown
ca8beb18dc languages 2012-12-27 23:18:41 -06:00
Andrew Brown
286f12a95a character role in story 2012-12-27 19:57:26 -06:00
Andrew Brown
4b91f4ccdc equipment (exclamation mark) 2012-12-26 23:30:04 -06:00
Andrew Brown
dcc24ea614 oh god that character form is so sexy now 2012-12-26 02:32:54 -06:00
Andrew Brown
e045883840 wtf when did it get 7am 2012-12-24 06:49:42 -06:00
Andrew Brown
9719d4ebc2 Validations on user signup 2012-12-23 22:33:59 -06:00
Andrew Brown
34689fa706 characters scaffolding 2012-12-23 17:42:28 -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