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
842505e838 bugfixes & polish 2019-08-09 15:53:24 -05:00
Andrew Brown
f975071648 allow adding a document to a universe 2019-08-09 13:30:05 -05:00
Andrew Brown
0568d452ec limit quick reference to premium users for launch 2019-08-06 23:50:47 -05:00
Andrew Brown
f812a1a91b Styling 2019-08-06 16:49:51 -05:00
Andrew Brown
684f3632d3 documents controller cleanup 2019-08-06 15:34:32 -05:00
Andrew Brown
2f86eaa61d remove old doc transition code + add analyze link to doc#show 2019-08-06 15:14:28 -05:00
Andrew Brown
da9973664a add documententities from @mentions in documents 2019-08-02 16:56:02 -05:00
Andrew Brown
41a69df3fd this is the most janky hax i've seen in 2019 2019-08-02 16:28:37 -05:00
Andrew Brown
67a3f650e2 waaaaay better ux on creating new docs 2019-08-02 01:21:23 -05:00
Andrew Brown
190ebbe36b fix 500 on short docs 2019-08-02 01:04:30 -05:00
Andrew Brown
8078430851 tada 2019-08-02 00:22:56 -05:00
Andrew Brown
2079f7b7b4 fix manually adding quick reference pages 2019-08-01 23:50:23 -05:00
Andrew Brown
5c21241cdd wip manual linking of document entities 2019-07-31 17:21:08 -05:00
Andrew Brown
1b40bb4b82 Merge branch 'master' into document-analysis 2019-07-26 03:02:22 -05:00
Andrew Brown
0cae9994aa time to sleep 2019-07-26 03:02:10 -05:00
Andrew Brown
75b79abfa6 documents#show also 2019-07-26 02:39:51 -05:00
Andrew Brown
6a41618be4 it's heckin slow but by my whiskers it actually works 2019-07-26 02:34:34 -05:00
Andrew Brown
d9fb52f856 fix 500 2019-07-23 21:34:29 -05:00
Andrew Brown
4be670aef3 address pr todos and comment shaking 2019-07-23 20:52:56 -05:00
Andrew Brown
03b5a565a7 allow removing entities from an analysis also 2019-07-23 19:49:39 -05:00
Andrew Brown
8107a4ce74 wow would you look at that it actually wors 2019-07-23 19:24:21 -05:00
Andrew Brown
d283e55328 allow creating documententities manually 2019-07-23 18:16:10 -05:00
Andrew Brown
63bdf83d23 sneaky 500 2019-07-12 13:12:36 -05:00
Andrew Brown
b8e4e3e5f5 unauth analysis for demos 2019-07-12 12:55:44 -05:00
Andrew Brown
255c39c86c styling + fixes + deleting analysis flow 2019-07-09 00:21:56 -05:00
Andrew Brown
1db322a310 Merge branch 'master' into document-analysis 2019-07-08 17:28:23 -05:00
Andrew Brown
3098a7f7c6 add admin page 2019-07-07 21:54:20 -05:00
Andrew Brown
c4308231d0 cleaning up 2019-07-07 21:40:44 -05:00
Andrew Brown
6c68975bd9 all the ui stuff for everything to work 2019-07-07 16:40:39 -05:00
Andrew Brown
ed1e2b8fa5 this code is disgusting but at least it works 2019-07-07 00:36:46 -05:00
Andrew Brown
4cd3ffb0ed link doc entities to existing pages 2019-06-13 00:19:02 -05:00
Andrew Brown
d22bc55e56 show linked documents on content pages 2019-06-12 18:47:08 -05:00
Andrew Brown
954cf1aad0 Merge branch 'master' into document-analysis 2019-06-12 15:14:25 -05:00
Andrew Brown
5af109f510 this shouldn't be necessary, but it be how it is 2019-06-12 12:19:29 -05:00
Andrew Brown
1934d8e526 fix 500 on viewing nonexistent documents 2019-06-12 12:16:00 -05:00
Andrew Brown
a786dd883a update permissions 2019-06-11 18:04:40 -05:00
Andrew Brown
cd41220a6e document sharing from documents#show 2019-06-11 17:34:18 -05:00
Andrew Brown
524119225e Fix fallbacks 2019-06-03 18:52:33 -05:00
Andrew Brown
eba71ae424 cross fingers on this dope merge hell 2019-06-03 18:42:42 -05:00
Andrew Brown
0267272dad show scope notice on content#index pages 2019-06-03 18:29:36 -05:00
Andrew Brown
70684c51a7
Merge pull request #381 from indentlabs/image-audits 
fix viewing image uploads in dev environments
 2019-05-31 22:32:41 -07:00
Andrew Brown
6989b041a9 fix 500 on user delete 2019-06-01 00:13:04 -05:00
Andrew Brown
c77b9173f9 attributes + make schools free 2019-05-30 15:53:03 -05:00
Andrew Brown
56ca3132f7 dismissals 2019-05-30 15:26:36 -05:00
Andrew Brown
89715f816b page_type:create for new pages 2019-05-29 22:00:31 -05:00
Andrew Brown
1000074536 fix viewing image uploads in dev environments 2019-05-29 18:42:49 -05:00
Andrew Brown
a476515d78 some logic readability 2019-05-13 22:33:54 -05:00
Andrew Brown
f37a54046e fix account deletion 2019-05-13 17:17:32 -05:00
Andrew Brown
56277b4a3d Merge branch 'master' into may-11 2019-05-12 22:55:25 -05:00
Andrew Brown
f90ed2b153
Merge branch 'master' into may-11 2019-05-12 20:53:08 -05:00
Andrew Brown
3e69ae6363
Merge branch 'master' into may-10 2019-05-12 13:25:28 -05:00
Andrew Brown
823fd547a0 shaking more trees 2019-05-11 17:31:32 -05:00
Andrew Brown
2fcc5501b7 better flash messages on attribute category/field creations 2019-05-11 17:27:01 -05:00
Andrew Brown
9eac45f80b oh golly gee 2019-05-11 16:31:56 -05:00
Andrew Brown
cf1713c11c controller/meta cleanup 2019-05-11 16:30:57 -05:00
Andrew Brown
d685faf4a6 allow contributors to edit page names & have it cached 2019-05-10 17:31:47 -05:00
Andrew Brown
2df32cf73a clear email before deleting users 2019-05-10 16:55:29 -05:00
Andrew Brown
b2ac9ca21f better stream query + better privacy indicator in stream 2019-05-10 15:52:27 -05:00
Andrew Brown
82f72a4099 profile redesign wip 2019-05-03 20:02:41 -05:00
Andrew Brown
0d6a0f1e24 various cleanups 2019-05-03 17:09:15 -05:00
Andrew Brown
b4842e5c1c cleaner permissions 2019-05-03 17:09:02 -05:00
Andrew Brown
22fd5b71a3 allow @mentioning universes 2019-05-03 16:49:02 -05:00
Andrew Brown
b1f62cccd2 redo the reverted commit 2019-05-03 16:29:17 -05:00
Andrew Brown
106daea496 Revert "code cleanup/naming" 
This reverts commit 7e62a9e299.
 2019-05-03 16:20:38 -05:00
Andrew Brown
af04137657 audit field migration service 2019-05-03 12:46:00 -05:00
Andrew Brown
7e62a9e299 code cleanup/naming 2019-05-03 12:20:35 -05:00
Andrew Brown
95d10b4313 hook up page linking w/ @mentions in docs 2019-04-09 21:04:44 -05:00
Andrew Brown
ee4e9e7aa4 bugfix https://rpm.newrelic.com/accounts/1783241/applications/71848250/traced_errors/5735f830-5673-11e9-8a81-0242ac11000f_0_6844 2019-04-03 19:53:39 -05:00
Andrew Brown
0f503b05e8 add back create new _content_ link in nav on content#show 2019-04-03 19:09:27 -05:00
Andrew Brown
f29fa3271a only show new _content_ link in header if a user can follow it 2019-04-03 18:56:42 -05:00
Andrew Brown
1e1c4bb837 image preloading on initial query 2019-03-18 22:18:51 -05:00
Andrew Brown
27dcf32f15 fix a big ol' whoopsie 2019-03-18 18:38:45 -05:00
Andrew Brown
04be9dce6b order and uniqify tags 2019-03-18 17:56:29 -05:00
Andrew Brown
812b9df23c hook up list filter bar + tag selection 2019-03-18 16:13:31 -05:00
Andrew Brown
899b3ad5f7 Merge branch 'master' into username-polish 2019-03-11 15:40:20 -05:00
Andrew Brown
6b91938790 add document analysis job, services, and piping 2019-02-24 20:21:01 -06:00
Andrew Brown
854707733a Merge branch 'master' into document-analysis 2019-02-24 18:59:15 -06:00
Andrew Brown
600c1b8310 some comments to help me remember to not be the worst 2019-02-24 18:22:52 -06:00
Andrew Brown
b5331a9daf be a little safer on that 2019-02-22 13:08:26 -06:00
Andrew Brown
f116276f10 fix regression on page tag create/update calls 2019-02-22 13:03:12 -06:00
Andrew Brown
b9873fb60b suggested tags for all page types 2019-02-16 01:39:12 -06:00
Andrew Brown
1d7d98592b add tags to content/list 2019-02-16 00:19:49 -06:00
Andrew Brown
649d589126 add tag filter to the top of content#index pages 2019-02-15 18:51:02 -06:00
Andrew Brown
cdf66dcea6 page tags hooked up on content page forms 2019-02-15 18:07:33 -06:00
Andrew Brown
b7427a6d37 wip page tags + IsContentPage abstraction 2019-02-15 16:17:57 -06:00
Andrew Brown
14bf670845 open it up 2019-02-05 13:35:29 -06:00
Andrew Brown
b4f1e26eb3 mockup prep 2019-02-05 13:27:31 -06:00
Andrew Brown
d7012e7236 temporarily allow view access to mockup endpoint 2019-02-05 13:24:57 -06:00
Andrew Brown
0a9af09084 more 2019-02-05 01:16:48 -06:00
Andrew Brown
cbda824463 add basic analytics mockup 2019-02-05 01:16:19 -06:00
Andrew Brown
6cd02e7b8f more 2019-02-05 01:15:51 -06:00
Andrew Brown
e3e1de4f6d document editor gets its own layout 2019-02-04 14:57:28 -06:00
Andrew Brown
90ad2ce274
Merge branch 'master' into username-polish 2019-01-16 18:46:53 -06:00
Andrew Brown
b6b2a0b2d6
Merge branch 'master' into jan-15-bugfix-release 2019-01-16 03:04:25 -06:00
Andrew Brown
cd0dc21e5d allow accessing profile by /@andrew 2019-01-15 18:20:01 -06:00
Andrew Brown
a948f34557 sync recent content dropdown with recent content page 2019-01-15 15:10:12 -06:00
Andrew Brown
2780724fdf allow reordering attributefields also 2019-01-12 16:13:05 -06:00
Andrew Brown
f0b2e319ba generalize content#api_sort to sort any content 2019-01-12 16:00:20 -06:00
Andrew Brown
ec40ea1618 there we go 2019-01-09 16:46:23 -06:00
Andrew Brown
73ae3ad754 wtf am i doing 2019-01-09 16:36:00 -06:00
Andrew Brown
76e16380b2 whoops 2019-01-09 16:20:10 -06:00
Andrew Brown
7f7a98f308 lets try this 2019-01-09 16:16:06 -06:00
Andrew Brown
391fa1d07c hook up attribute category sort backend 2019-01-09 16:05:07 -06:00
Andrew Brown
60b4aaed98 fix for universes as @content 2019-01-05 21:52:46 -06:00
Andrew Brown
f26dae648e avoid some extra db calls 2019-01-05 21:45:47 -06:00
Andrew Brown
74e13dd69b mock disabled redirection to subscription path on cant_create(content) on dashboard 2019-01-05 21:06:30 -06:00
Andrew Brown
ed232b3373 always cache user universes 2019-01-05 17:30:40 -06:00
Andrew Brown
e6d31cdabb beef up profiles 2019-01-03 15:51:42 -06:00
Andrew Brown
5a96324c8f break changelog into its own page & clean up routes 2019-01-03 13:57:15 -06:00
Andrew Brown
3b8e49d83a #show-specific actions 2019-01-03 12:55:55 -06:00
Andrew Brown
d42a495d0c exclude documents from export controller logic 2019-01-02 23:51:39 -06:00
Andrew Brown
d31144493e more cleanup / don't bother with wrangling regi bug 2019-01-02 23:10:16 -06:00
Andrew Brown
1364dcf00d fix navbar when logged out 2019-01-02 14:37:10 -06:00
Andrew Brown
9e9639c27d reorder nav header opts 2018-12-18 22:59:22 -06:00
Andrew Brown
6a20524882 general polishes 2018-12-18 18:24:14 -06:00
Andrew Brown
456e77697b nice content tooltip text + more prompts polish 2018-12-18 17:03:46 -06:00
Andrew Brown
94489084db style prompts a bit 2018-12-18 16:52:09 -06:00
Andrew Brown
0327247544 documents#show 2018-12-18 16:48:59 -06:00
Andrew Brown
81b970d878 move document delete link from index to edit 2018-12-18 16:14:54 -06:00
Andrew Brown
6001787f68 conditionally show footer & some document editor work 2018-12-18 15:32:36 -06:00
Andrew Brown
2cf4b28cb1 prompts page pt. 1 2018-12-13 19:02:09 -06:00
Andrew Brown
11f67f571c content cover headers 2018-12-13 01:35:16 -06:00
Andrew Brown
6721082fbd Merge branch 'master' into sidenav-ui 2018-12-12 23:58:50 -06:00
Andrew Brown
4ac3e5b242 content#index work 2018-12-12 23:58:22 -06:00
Andrew Brown
96897a1d49 documents index pt. 2: electric boogaloo 2018-12-12 17:59:48 -06:00
Andrew Brown
d70ffa711f documents#index pt. 1 2018-12-12 15:25:39 -06:00
Andrew Brown
c74b2de7bf sidenav expansion for writing 2018-12-12 14:13:08 -06:00
Andrew Brown
861081d5a7 dashboard polish 2018-12-12 14:07:40 -06:00
Andrew Brown
1c8f3df92b navbar hex coloring & sidenav expansion 2018-12-11 21:11:11 -06:00
Andrew Brown
1b32ac87d1 dynamic discussions links for content 2018-12-05 21:49:33 -06:00
Andrew Brown
0df20d964f wip 2018-12-05 21:33:38 -06:00
Andrew Brown
6611af2e00 dynamic colors for content controller 2018-12-05 19:47:44 -06:00
Andrew Brown
0d94097c7b same 2018-12-04 13:20:53 -06:00
Andrew Brown
2d75d8f688 checks on valid find_bys 2018-12-04 13:00:34 -06:00
Andrew Brown
be38648b87
Merge pull request #312 from indentlabs/dec-update-2 
December update 2
 2018-12-03 03:47:32 -05:00
Andrew Brown
9233395120 fix scope user 2018-12-03 02:38:17 -06:00
Andrew Brown
efa2c09b3d fix unread pm count 2018-12-03 02:33:29 -06:00
Andrew Brown
461a39224d parens 2018-12-03 01:30:22 -06:00
Andrew Brown
97bf9c16cb don't throw 500s when trying to find() nonexistent pages 2018-12-02 16:32:19 -06:00
Andrew Brown
cccaafa576 changes for new thredded versions 2018-12-02 14:35:02 -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
3db1be41f6 wip for #new 2018-11-27 05:04:12 -06:00
Andrew Brown
f41372c7d4 fix changelog field linking 2018-11-23 18:51:09 -06:00
Andrew Brown
298d0e1c83 use serializer for json endpoint 2018-11-23 10:56:54 -06:00
Andrew Brown
fe0eb8d0da render sidelinks with content serializer & add serializer json api endpoint 2018-11-23 09:15:07 -06:00
Andrew Brown
60043beb4f exclude social-share-button css 2018-11-20 20:04:20 -06:00
Andrew Brown
3418b4a3a3 fix 2018-11-20 02:44:13 -06:00
Andrew Brown
ee2ce7b91f fix already lol 2018-11-20 02:41:51 -06:00
Andrew Brown
ef661a10cd preserve \n in documents by updating to br element 2018-11-20 02:36:09 -06:00
Andrew Brown
aaa7199053 pr polish 2018-11-15 16:17:30 -06:00
Andrew Brown
ecd252a1cd Merge branch 'master' into documents 2018-11-14 14:47:42 -06:00
Andrew Brown
293f381e4e Merge branch 'master' into november-pages 2018-11-08 18:12:51 -06:00
Andrew Brown
e28b421efe don't 500 if someone's... logged out? 2018-11-03 13:04:28 -05:00
Andrew Brown
f8de631cf8 enable custom attributes on new pages 2018-11-01 18:47:27 -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
80c3052586 Fix & redesign search 2018-10-31 16:27:04 -05:00
Andrew Brown
a413e0b764 send unsubscribed email when unsubscribing someone 2018-10-31 14:14:17 -05:00
Andrew Brown
02ac1ff696 use subscription service for canceling subscriptions 2018-10-31 13:41:56 -05:00
Andrew Brown
61ab016bfb add unsubscribe logic for admins 2018-10-31 13:35:52 -05:00
Andrew Brown
f6c1b7817f change masquerade permissions 2018-10-31 13:19:13 -05:00
Andrew Brown
cc95a7e9cd another profile fix 2018-10-22 02:15:31 -05:00
Andrew Brown
239b12b2eb fix old-style profiles 2018-10-22 02:07:30 -05:00
Andrew Brown
8f76f587e7 delete users asynchronously 2018-10-22 01:30:52 -05:00
Andrew Brown
2afbb9b340 group profile contents by attribute->entity 2018-10-22 01:30:12 -05:00
Andrew Brown
de2b8645f2 Fix outline exporting 2018-10-20 16:19:24 -05:00
Andrew Brown
78e90d7a0d polish index 2018-10-18 23:48:39 -05:00
Andrew Brown
6db4e541f1 card design on document list 2018-10-18 22:31:37 -05:00
Andrew Brown
4cc1558a7b Add document autosaving 2018-10-18 15:20:56 -05:00
Andrew Brown
02d5454bfa allow un-deleting documents 2018-10-18 13:58:52 -05:00
Andrew Brown
17cbdda831 fill out controller actions 2018-10-18 13:43:02 -05:00
Andrew Brown
c07c1036b6 add documents permissions + deletion logic frame 2018-10-18 13:23:06 -05:00
Andrew Brown
36eab5f4e3 Merge branch 'master' into documents 2018-10-18 13:11:10 -05:00
Andrew Brown
9cc5eb943e Require login to view recently-deleted and attributes controller actions 2018-10-18 13:06:38 -05:00
Andrew Brown
54d773988c only move users to a new plan when one is provided 2018-10-18 12:49:22 -05:00
Andrew Brown
454a72b104 debug if someone upgrades to a plan that doesn't exist 2018-10-18 12:44:52 -05:00
Andrew Brown
9e21ef173e fix search 2018-10-18 11:47:32 -05:00
Andrew Brown
5f8ca60e9b use up to date names on recent content page 2018-10-17 18:32:24 -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
f767fa50c2 fix a potential 500 when a universe is prompted 2018-10-17 12:31:09 -05:00
Andrew Brown
647a52af90 get documents working 2018-10-02 01:53:28 -05:00
Andrew Brown
d80ff65509 document resource stuff 2018-10-01 23:09:42 -05:00
Andrew Brown
6ca4bfe76c formatting 2018-10-01 22:40:00 -05:00
Andrew Brown
ebef2cfcb4 fix perms 2018-10-01 21:59:40 -05:00
Andrew Brown
63120b268d allow users to undelete content pages for 24 hours 2018-09-28 22:58:55 -05:00
Andrew Brown
4e7b1c8bf8 list optimizations 2018-09-24 17:27:16 -05:00
Andrew Brown
ad9c9963da clean up 2018-09-24 13:20:35 -05:00
Andrew Brown
1d1aaf5e22 more small wins 2018-09-24 12:02:06 -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
2fd6af8ef5 kill another query 2018-09-24 01:06:03 -05:00
Andrew Brown
5bd47b3afc remove N sql queries from footer 2018-09-24 01:02:13 -05:00
Andrew Brown
b9e32c1b13 cleanup 2018-09-21 13:22:03 -05:00
Andrew Brown
b1044655cc order link buttons 2018-09-19 17:48:31 -05:00
Andrew Brown
9587b44785 big optimization win + link dropdowns on text fields 2018-09-19 16:08:44 -05:00
Andrew Brown
4b6ff2e2a9 fix prompts not always randomizing fields 2018-09-16 21:29:38 -05:00
Andrew Brown
833199dfc6 minor fixes 2018-09-16 21:17:44 -05:00
Andrew Brown
a6be1f5eac few db optimizations 2018-09-14 07:15:20 -05:00
Andrew Brown
c6f820e7e4 fixes from papercut qa 2018-09-11 00:11:47 -05:00
Andrew Brown
78daa1e9dd fix migration for existing users 2018-09-10 20:06:09 -05:00
Andrew Brown
e0a4cc91a9 add masquerade endpoint 2018-09-10 17:25:19 -05:00
Andrew Brown
54ee1a70a4 optimize migration + stick it in service for external running 2018-09-10 16:28:13 -05:00
Andrew Brown
5f1b673163 optimize migration logic 2018-09-10 16:14:53 -05:00
Andrew Brown
141d7d5bdf redirect on deleted user content 2018-09-09 00:49:36 -05:00
Andrew Brown
ec826eda9f don't 500 on deleted user's content 2018-09-09 00:35:41 -05:00
Andrew Brown
dea9301faf use redirect_back for subscription changes 2018-09-08 23:19:09 -05:00
Andrew Brown
8f01115015 fix profile page streams 2018-09-08 22:32:44 -05:00
Andrew Brown
f50cb13a48 fix 500 2018-09-08 03:02:11 -05:00
Andrew Brown
67beb2ecab show most up to date name in universe cards 2018-09-07 23:04:54 -05:00
Andrew Brown
5db834fb73 cleanup 2018-09-07 22:57:34 -05:00
Andrew Brown
676974b4df re-enable a few more field types 2018-09-07 22:02:47 -05:00
Andrew Brown
be9b39adca re-enable autocomplete per label 2018-09-07 21:51:58 -05:00
Andrew Brown
3ac6c2ed5b Remove unused serendipitous logic 2018-09-07 20:23:32 -05:00
Andrew Brown
d8b7b0e0c6 switch to using redirect_back 2018-09-07 20:13:37 -05:00
Andrew Brown
045f13685a better error reporting 2018-09-07 14:30:06 -05:00
Andrew Brown
48411f0ef7 potentially fix naming issue 2018-09-07 14:06:02 -05:00
Andrew Brown
8bf1488b9d just in case 2018-09-05 14:14:25 -05:00
Andrew Brown
fac8c7ded5 fix fields on deity/government/planet/technology 2018-09-05 13:42:12 -05:00
Andrew Brown
c9e099c5f3 fix editing universes 2018-09-04 16:53:07 -05:00
Andrew Brown
bc163cd312 fix universe creation + universe setting on content pages 2018-09-04 16:12:29 -05:00
Andrew Brown
383e1d0935 fix the rest of changelog 2018-09-03 13:29:40 -05:00
Andrew Brown
5872f19577 I think this is right? 2018-09-03 12:24:52 -05:00
Andrew Brown
2a1a3e20d8 disable changelogs for attribute migration 2018-08-31 16:57:50 -05:00
Andrew Brown
4a00731bb4 universe field 2018-08-25 18:15:10 -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
fb1ebdcb50 create default pages if not existing + toggleable hiddens 2018-08-18 15:43:27 -05:00
Andrew Brown
b3728f39be add page customization page 2018-08-16 10:58:21 -05:00
Andrew Brown
c2a686a6af fix minor bug 2018-08-15 19:54:42 -05:00
Andrew Brown
dab5d5f0ea Merge branch 'master' into rails5-upgrade 2018-08-15 16:31:37 -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
ec67c23b7d address deprecations 2018-07-05 01:35:40 -05:00
Andrew Brown
2934c4493c fix redirects 2018-03-03 17:03:49 -06:00
Andrew Brown
f3dda1483c send some future code dormant 2018-03-03 16:54:16 -06:00
Andrew Brown
ee06aa29d2 subscriptions refactor 2018-03-03 16:49:08 -06:00
Andrew Brown
faa3e0b1b4 Authenticate users in subscription controller 2018-03-03 14:08:58 -06:00
Andrew Brown
af1bcf05ea initialize stripe sub for returning subs 2018-02-22 14:58:54 -06:00
Andrew Brown
2c0f0f7ff4 increase user stream from 10 to 100 items 2018-02-11 23:47:21 -06:00
Andrew Brown
a6c5b8d897 don't report new accounts to slack anymore 2018-02-02 15:16:33 -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
f25db5b898 order dashboard in the same way the sidenav is ordered 2018-02-01 19:38:17 -06:00
Andrew Brown
a25d67a6ef context cards for everyone 2018-01-31 15:57:06 -06:00
Andrew Brown
786569315f add material uses to flora 2018-01-31 00:50:47 -06:00
Andrew Brown
9befdaad13 add classification to creatures 2018-01-31 00:47:22 -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
7ee02b2e45 deity categories + rename universe technologies field to technology 2018-01-28 21:50:33 -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
ac38502720 refactor exports 2018-01-27 13:50:29 -06:00
Andrew Brown
12e20d7a24 Clean up export and frame planet page type 2018-01-27 13:47:54 -06:00
Andrew Brown
d7c791bfef remove redundant controller methods 2018-01-27 13:18:49 -06:00
Andrew Brown
a59d7bf2e8 Downcase contributor emails to make them case insensitive 2018-01-25 17:15:31 -06:00
Andrew Brown
8e2cb03ab0 use rails config 2018-01-22 23:44:15 -06:00
Andrew Brown
e308ad5a52 lessen changelog stream 2018-01-19 18:46:49 -06:00
Andrew Brown
f348b462c6 includes 2018-01-18 22:43:21 -06:00
Andrew Brown
35498bfbd0 recent content list optimizations 2018-01-16 00:04:51 -06:00
Andrew Brown
c7b1baaffd content#index and sidenav optimizations 2018-01-15 23:52:57 -06:00
Andrew Brown
de4276b2af recent content list opts 2018-01-15 23:26:35 -06:00
Andrew Brown
ddd0b397cf minor fix 2018-01-12 00:20:00 -06:00
Andrew Brown
72ee035b16 improve admin stats panel 2018-01-12 00:12:30 -06:00
Andrew Brown
5d09079139 enable custom attributes on towns, landmarks, and countries 2018-01-09 23:34:03 -06:00
Andrew Brown
0edd9950a7 fix 500 that could occur on log out 2018-01-01 17:19:48 -06:00
Andrew Brown
f55b564c8f include necessary profile routes for new content 2018-01-01 16:29:22 -06:00
Andrew Brown
59003bd9de require signin for page type customization 2018-01-01 16:23:41 -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
74854784cf content type magic constant cleanup 2017-12-28 16:39:01 -06:00
Andrew Brown
bfe3aa74a3 redirect to root path on 400 2017-12-28 01:26:38 -06:00
Andrew Brown
9600a6fb32 Only show activated content types on user dashboards 2017-12-27 20:20:17 -06:00
Andrew Brown
4490b0f15d Fix unfortunate error in userscontroller :( 2017-12-27 15:35:58 -06:00
Andrew Brown
19d4aa275e Redirect for browsers that can't handle remote 2017-12-27 15:08:18 -06:00
Andrew Brown
db8ebc9e30 update account deletion slack string 2017-12-27 14:49:56 -06:00
Andrew Brown
70b41e5d26 Functionality for toggling page types on/off 2017-12-27 14:35:15 -06:00
Andrew Brown
f2a42a0bae Add page type customization page 2017-12-27 13:50:48 -06:00
Andrew Brown
049b59ac15 Add 'love interest' linked field to characters 2017-12-26 15:44:35 -06:00
Andrew Brown
30e25cea3e Allow users to delete their own account :( 2017-12-26 15:34:52 -06:00
Andrew Brown
f626b65d53 redesign account info page 2017-12-26 15:01:23 -06:00
Andrew Brown
d27244217a increase recent activity count 2017-11-25 05:06:31 +01:00
Andrew Brown
c1b57c3c16 include user universes page 2017-11-25 04:59:33 +01:00
Andrew Brown
b9cf1ee3e7 redesign user profile page 2017-11-25 04:56:06 +01:00
Andrew Brown
d988a3f38d only send to mixpanel in prod 2017-11-11 21:25:17 +01:00
Andrew Brown
f3a4af04e2 divide by cents 2017-11-11 18:08:29 +01:00
Andrew Brown
d1705323d2 pass tests by checking env until I can figure out how to mock Stripe::StripeObject#save 2017-11-10 16:40:38 +02:00
Andrew Brown
9c6b3711cc fix bug in downgrading to starter being out of sync sometimes 2017-11-10 16:38:49 +02:00
Andrew Brown
9560c5b1e3 report correct sub counts to slack 2017-11-10 16:15:05 +02:00
Andrew Brown
6f003ce7a3 add floras to exportable csvs 2017-11-09 20:18:16 +02:00
Andrew Brown
1593fbf484 Use AttributeAuthorizer for attributes, attribute fields, and attribute categories 2017-11-09 19:12:44 +02:00
Andrew Brown
ba5e03ac27 use blacklist for not showing content 2017-10-28 23:53:59 +03:00
Andrew Brown
4e8d1ba9b8 Merge branch 'master' into thredded 2017-10-28 21:10:24 +03:00
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