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

763 Commits

Author SHA1 Message Date
Andrew Brown
b6b2a0b2d6
Merge branch 'master' into jan-15-bugfix-release 2019-01-16 03:04:25 -06:00
Andrew Brown
ff596da24a fix 500 on universe link in quick reference 2019-01-15 14:43:52 -06:00
Andrew Brown
6e1cf39012 rename categories without having to reload the page 2019-01-15 14:37:20 -06:00
Andrew Brown
5e84558d68 allow deleting non-required categories 2019-01-15 14:28:46 -06:00
Andrew Brown
b79e0aed07 allow renaming categories 2019-01-13 01:13:34 -06:00
Andrew Brown
2037bae7fe remove debug lines 2019-01-13 01:08:18 -06:00
Andrew Brown
28572d6589 more polish around attributes page 2019-01-13 00:56:01 -06:00
Andrew Brown
0f8410d9a3 inline renaming 2019-01-13 00:40:55 -06:00
Andrew Brown
3c5b1de37c do a little restyling 2019-01-13 00:30:23 -06:00
Andrew Brown
a8fb83416d allow renaming fields 2019-01-13 00:16:29 -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
b6e25b81bd woo it works, remove debug line 2019-01-09 16:53:40 -06:00
Andrew Brown
391fa1d07c hook up attribute category sort backend 2019-01-09 16:05:07 -06:00
Andrew Brown
2a62cee922 add sortable & handlers 2019-01-09 14:01:28 -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
8ed53cb082 automatically add new content to scoped universe 2019-01-05 20:37:21 -06:00
Andrew Brown
9b515d8748 create AN item, not create a item 2019-01-05 20:25:21 -06:00
Andrew Brown
34b8bde585 fix parallax attributes partial 2019-01-05 20:11:00 -06:00
Andrew Brown
85ef9cb8a1 fix universe linking in quick reference 2019-01-05 19:53:35 -06:00
Andrew Brown
db9015667f remove redundant ui 2019-01-05 19:32:24 -06:00
Andrew Brown
4554227146 restore quick reference on serendipitous cards 2019-01-04 13:54:44 -06:00
Andrew Brown
5a96324c8f break changelog into its own page & clean up routes 2019-01-03 13:57:15 -06:00
Andrew Brown
e3e994b18e dont stretch images on dashboard 2019-01-03 03:10:43 -06:00
Andrew Brown
6c52e3edfb make some room on profiles 2019-01-03 02:50:13 -06:00
Andrew Brown
a0e87a57dd recent content page 2019-01-03 01:59:03 -06:00
Andrew Brown
6a20524882 general polishes 2018-12-18 18:24:14 -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
a8306c7beb filter bar 2018-12-12 21:21:31 -06:00
Andrew Brown
96897a1d49 documents index pt. 2: electric boogaloo 2018-12-12 17:59:48 -06:00
Andrew Brown
c0be172c11 minor tweaks 2018-12-11 23:39:39 -06:00
Andrew Brown
293e7457b1 dropdowns over content headers / fabs 2018-12-11 13:25:42 -06:00
Andrew Brown
6611af2e00 dynamic colors for content controller 2018-12-05 19:47:44 -06:00
Andrew Brown
6364616d04 qip 2018-12-05 17:14:53 -06:00
Andrew Brown
0458f67cbf fix 500 2018-12-04 13:18:36 -06:00
Andrew Brown
3f5ada6f62 typo on field type prevented links from showing 2018-12-03 23:26:35 -06:00
Andrew Brown
59f3a0e37f fix universes contrib perms 2018-12-03 01:09:38 -06:00
Andrew Brown
9909ad6eff fix universe setting 2018-12-02 15:03: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
d2db47a5b9 fix contributors link 2018-11-28 02:02:01 -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
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
40756bc5af pretend i'm not literally the worst programmer in history 2018-11-24 20:43:13 -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
accda73b93 clean up unused code 2018-11-23 19:16:06 -06:00
Andrew Brown
6db9a57ead use serialized content model on edit page 2018-11-23 19:11:59 -06:00
Andrew Brown
f41372c7d4 fix changelog field linking 2018-11-23 18:51:09 -06:00
Andrew Brown
38172254d9 use content serializer on content#show 2018-11-23 10:48:49 -06:00
Andrew Brown
62c8a26d91 serialize content for visitor_cta partial 2018-11-23 09:19:10 -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
170a0d616b allow tabbing from field to field 2018-11-20 20:16:17 -06:00
Andrew Brown
34fdc6c1aa resize card headers 600x400 2018-11-09 13:27:24 -06:00
Andrew Brown
5ada40f8f4 add job field to characters 2018-11-08 18:52:46 -06:00
Andrew Brown
193d61e478 temporarily disable quick reference 2018-10-21 18:22:41 -05:00
Andrew Brown
b56200627a Don't link to deleted pages on the recently-deleted page 2018-10-20 16:48:15 -05:00
Andrew Brown
d306ab1dc0 todo 2018-10-18 00:45:43 -05:00
Andrew Brown
6085a4aac2 better readability 2018-10-17 23:56:30 -05:00
Andrew Brown
263093ad80 use name field for recent content names again, but with bugfiz 2018-10-17 18:35:40 -05:00
Andrew Brown
5f8ca60e9b use up to date names on recent content page 2018-10-17 18:32:24 -05:00
Andrew Brown
68445754e3 specify page type in polymorphic paths 2018-10-17 18:20:42 -05:00
Andrew Brown
c987fd5d1b fix timestamp 2018-10-01 22:00:55 -05:00
Andrew Brown
f5c6004527 fix 500 on recently edited list page 2018-10-01 21:07:08 -05:00
Andrew Brown
63120b268d allow users to undelete content pages for 24 hours 2018-09-28 22:58:55 -05:00
Andrew Brown
8be6f79213 safety 2018-09-24 17:40:49 -05:00
Andrew Brown
4e7b1c8bf8 list optimizations 2018-09-24 17:27:16 -05:00
Andrew Brown
1d1aaf5e22 more small wins 2018-09-24 12:02:06 -05:00
Andrew Brown
a1300b3754 re-use simple_format 2018-09-22 01:59:43 -05:00
Andrew Brown
5be30bd5bb link bar tooltips 2018-09-21 16:01:43 -05:00
Andrew Brown
3bb191fc0a phew, abstracted link bar to a template that gets populated on field focus 2018-09-21 15:00:59 -05:00
Andrew Brown
294c87227a test page loads without link bar 2018-09-21 14:34:33 -05:00
Andrew Brown
b8bd5f9801 load panels in hidden by default 
'
 2018-09-21 14:18:39 -05:00
Andrew Brown
1065721e72 don't recompute activators on each field 2018-09-21 14:06:36 -05:00
Andrew Brown
a7abb3e66f more polish 2018-09-21 13:43:56 -05:00
Andrew Brown
c21c842b7c cleanup 2018-09-19 18:36:24 -05:00
Andrew Brown
e85084b513 finish up page linking on text fields 2018-09-19 17:40:32 -05:00
Andrew Brown
ad219d23c0 Revert "Revert "make all field textareas full-width"" 
This reverts commit fd77759431.
 2018-09-19 16:47:27 -05:00
Andrew Brown
fd77759431 Revert "make all field textareas full-width" 
This reverts commit 25b1878a90.
 2018-09-19 16:46:35 -05:00
Andrew Brown
49ad6b1d98 small memory optimization 2018-09-19 16:11:17 -05:00
Andrew Brown
9587b44785 big optimization win + link dropdowns on text fields 2018-09-19 16:08:44 -05:00
Andrew Brown
25b1878a90 make all field textareas full-width 2018-09-19 15:28:18 -05:00
Andrew Brown
a4de7be4cd fix field placeholders 2018-09-19 15:15:24 -05:00
Andrew Brown
6fdf045113 add rich text input partial 2018-09-19 15:15:02 -05:00
Andrew Brown
b994dcc66b render [[character-34]]-style links on content#show 2018-09-19 15:06:52 -05:00
Andrew Brown
9dec1bcbbd fix images not loading 2018-09-17 13:49:38 -05:00
Andrew Brown
754ba9dc12 code cleanup 2018-09-16 22:18:53 -05:00
Andrew Brown
27edbf5131 optimize image upload queries 2018-09-16 22:16:21 -05:00
Andrew Brown
833199dfc6 minor fixes 2018-09-16 21:17:44 -05:00
Andrew Brown
65ce95896d re-use queries when possible 2018-09-14 07:16:01 -05:00
Andrew Brown
f3bfd604c9 remove debug 2018-09-11 03:28:44 -05:00
Andrew Brown
1b69b218f4 debug for papercut 2018-09-11 03:09:41 -05:00
Andrew Brown
c6f820e7e4 fixes from papercut qa 2018-09-11 00:11:47 -05:00
Andrew Brown
821dec5a3a fix premium creation post-subscribing 2018-09-10 20:07:44 -05:00
Andrew Brown
8973a5703b safety 2018-09-10 19:04:52 -05:00
Andrew Brown
c7ea606d86 add mobile link to the forums 2018-09-10 18:41:35 -05:00
Andrew Brown
4a822c70d1 more optimizations -- hope this works! :) 2018-09-10 17:19:11 -05:00
Andrew Brown
8e281d442c move js to end-of-page 2018-09-10 17:04:39 -05:00
Andrew Brown
c1e62a8f7f more optimizations 2018-09-10 16:57:09 -05:00
Andrew Brown
94e21e8d1f code cleanup 2018-09-10 16:29:05 -05:00
Andrew Brown
5f1b673163 optimize migration logic 2018-09-10 16:14:53 -05:00
Andrew Brown
03322745b4 remove unused partial 2018-09-10 15:47:27 -05:00
Andrew Brown
622fd65777 allow reusing categories in sidelinks partial 2018-09-10 15:47:18 -05:00
Andrew Brown
b9142161eb add additional indices 2018-09-10 03:48:21 -05:00
Andrew Brown
95659b6220 more includes 2018-09-10 03:18:49 -05:00
Andrew Brown
1bd3b3dd77 clean up unused code 2018-09-10 03:01:46 -05:00
Andrew Brown
42e02162d1 remove unused query + reuse one query 2018-09-10 03:00:42 -05:00
Andrew Brown
78153ec126 enable bullet 2018-09-10 02:30:56 -05:00
Andrew Brown
5df56992df include polymorphic path 2018-09-09 00:24:15 -05:00
Andrew Brown
b2559aab7d oops 2018-09-09 00:06:02 -05:00
Andrew Brown
243b8480e5 fix collaboration attribute distribution 2018-09-08 23:53:03 -05:00
Andrew Brown
890335c28b add notice for private fields 2018-09-08 23:27:48 -05:00
Andrew Brown
d216bd87c7 don't 500 in this case on content/index 2018-09-08 23:20:21 -05:00
Andrew Brown
af19015834 hide the answer to any field starting with 'Private' in changelogs 2018-09-08 22:49:17 -05:00
Andrew Brown
67beb2ecab show most up to date name in universe cards 2018-09-07 23:04:54 -05:00
Andrew Brown
be9b39adca re-enable autocomplete per label 2018-09-07 21:51:58 -05:00
Andrew Brown
e9f5c961a5 disable attribute field dropdowns for now 2018-09-07 21:32:54 -05:00
Andrew Brown
ad6f557e3f stop tabbing to attribute field dropdowns 2018-09-07 21:31:08 -05:00
Andrew Brown
f89d4ce68c include links in check for whether to show a sidelink 2018-09-07 20:39:13 -05:00
Andrew Brown
3ac6c2ed5b Remove unused serendipitous logic 2018-09-07 20:23:32 -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
e21590747c fix another 500 2018-09-05 14:48:09 -05:00
Andrew Brown
231642cc6d look up universe if we have universe id instead 2018-09-05 14:26:45 -05:00
Andrew Brown
ba6f914223 fix universe loading on first edit 2018-09-05 14:01:48 -05:00
Andrew Brown
7ad90c53f4 fix minor 500 2018-09-05 00:17:40 -05:00
Andrew Brown
46683302f8 update universe link 2018-09-04 20:55:22 -05:00
Andrew Brown
980b1889cd disable autocomplete 2018-09-04 18:12:48 -05:00
Andrew Brown
44ed4080f2 gross hack for field ordering for now 2018-09-04 16:48:38 -05:00
Andrew Brown
689aa0b5a2 fix content header on attributes page 2018-09-04 16:29:13 -05:00
Andrew Brown
da978d9d9a fix header images 2018-09-04 16:23:31 -05:00
Andrew Brown
92e6f9ac75 fix card headers links 2018-09-04 03:46:51 -05:00
Andrew Brown
670a4874a7 fix prompts page 2018-09-04 02:34:24 -05:00
Andrew Brown
2ed2f92dd8 fix serendipitous question 2018-09-04 01:38:59 -05:00
Andrew Brown
1e5e1586c7 only show relevant icons 2018-09-03 15:49:55 -05:00
Andrew Brown
7d555e2fb0 style up attributes page / icons overrides form 2018-09-03 15:18:09 -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
383e1d0935 fix the rest of changelog 2018-09-03 13:29:40 -05:00
Andrew Brown
46a997695a role stand-in for content#index 2018-08-31 18:01:34 -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
2d755ceeb5 fi logic 2018-08-22 19:46:00 -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
b3728f39be add page customization page 2018-08-16 10:58:21 -05:00
Andrew Brown
680f04c50d add cta to customize pages 2018-08-16 01:15:17 -05:00
Tristan
1a24d00bd1 oops, undo that last bit 2018-08-08 11:50:56 -05:00
Tristan
40d481ed5d adjust image sizes 2018-08-08 11:46:39 -05:00
Tristan
a816362bcd fix paperclip polymorphism issue 2018-08-08 11:42:17 -05:00
Tristan
47bfa9b6a6 Fix dropdown issue from materialize upgrade 2018-06-19 19:43:52 -05:00
Tristan
7fe9a7914e Extract current autocomplete options to a service 2018-06-07 01:20:08 -05:00
Tristan
c158ad0b68 add autocomplete indicators + helpful tooltip 2018-06-07 00:52:16 -05:00
Tristan
bf242a8e87 Re-add changes that got lost somewhere along the way 2018-06-07 00:32:54 -05:00
Tristan
c534d84bd4 enable field autocomplete 2018-06-06 23:17:49 -05:00
Tristan
826f962eec Upgrade to materialize 1.0 beta 2018-06-06 23:13:28 -05:00
Tristan
fd322bf7b2 polish content lists 2018-06-06 01:07:30 -05:00
Tristan
73662c22da redesign content list partial 2018-06-06 00:48:03 -05:00
Euan Kemp
aa6aed7131 Require a 'name' in quick-add 
Before this change it was very easy to click 'quick-add' and have a
blank line be added which would vanish on refresh.

There's additional issues present here which should be addressed, but I
think this resolves the sharpest edge for a user to run into.
 2018-05-22 22:22:20 -07: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
2c016ca4ac scope content dropdowns to the same universe, if present 2018-01-31 00:55:29 -06:00
Andrew Brown
3b2c39fd65 verbiage change to clarify content linking 2018-01-30 23:47:29 -06:00
Andrew Brown
a0fda99ea2 partial cleanup 2018-01-26 23:34:29 -06:00
Andrew Brown
8387fcb936 Default card titles for blank 2018-01-16 10:47:53 -06:00
Andrew Brown
7cd177e5b1 dashboard optimizations 2018-01-16 00:21:12 -06:00
Andrew Brown
c7b1baaffd content#index and sidenav optimizations 2018-01-15 23:52:57 -06:00
Andrew Brown
66ee95e9b1 remove dead code 2018-01-15 23:27:18 -06:00
Andrew Brown
56c3317235 temporarily disable image lookups 2018-01-15 23:26:52 -06:00
Andrew Brown
5f5c83a4c7 Show content's custom categories, not current user's custom categories 2018-01-15 14:33:08 -06:00
Andrew Brown
81bf57debc include link to new blog post about privacy: 2018-01-10 16:46:52 -06:00
Andrew Brown
87f1bfc697 Display (blank) as text for blank custom attribute categories 2018-01-07 08:46:18 -06:00
Andrew Brown
04f8a89b4a Include contributable content in linked lists 2018-01-06 20:49:30 -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
0904fb9a71 maybe a fix? 2017-12-28 01:07:47 -06:00
Andrew Brown
d0a8bfe36a comment out erroring line while I debug 2017-12-28 00:53:11 -06:00
Andrew Brown
f548c83143 Fix 500 on content pages for people with negative upload bandwidth 2017-11-11 20:53:48 +01:00
Andrew Brown
a6fd516b49 conclude october promo 2017-11-01 16:54:59 +02:00
Andrew Brown
2d5fb83665 Merge branch 'master' of https://git.heroku.com/production-1 2017-10-17 16:45:01 +03:00
Andrew Brown
365e76951a Bugfix: Display identmarks field on characters 2017-10-12 13:59:28 +02:00
Andrew Brown
57c5145ff4 Add tool for datafilling characters 2017-10-09 00:26:29 +02:00
Andrew Brown
baf7d2795d Make everything free 2017-10-02 18:26:21 +02:00
Andrew Brown
333f98a526 Add a 'new' badge on contributors in content sidelinks 2017-10-01 23:05:59 +02:00
Andrew Brown
5aa61e1c76 Don't show invitees to anyone other than content owner 2017-10-01 22:58:16 +02:00
Andrew Brown
d95f0f1c73 Don't show content footer to universe owner 2017-09-30 23:42:30 +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
e021acc60c Fix content editing/saving tests 2017-09-30 14:47:55 +02:00
Andrew Brown
93a7ba3f54 polishing 2017-08-17 19:56:59 +02:00
Andrew Brown
f55791f10d fix intermittent 500s 2017-08-17 18:23:40 +02:00
Andrew Brown
0e972c186b we're legitimate hackers now 2017-08-17 03:28:55 +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
dfdb81d854 more permissions 2017-08-17 00:30:48 +02:00
Andrew Brown
d1d157dbb4 privacy on private notes vs contributors 2017-08-15 14:17:46 +02:00
Andrew Brown
39327f8d5f assign invites to users on signup 2017-08-15 13:51:17 +02:00
Andrew Brown
b6240fc814 treat contribs as contribs even on content they create in another universe 2017-08-15 13:45:07 +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
189ad8d221 Polish up card list ui 2017-08-05 02:33:33 +02:00
Andrew Brown
10d121aed6 Whoops, fix 500 2017-08-05 02:27:48 +02:00
Andrew Brown
06c2d08c9b Universe-specific relation pages for content types 2017-08-05 01:52:20 +02:00
Andrew Brown
053b16fd4e polishing 2017-07-31 03:49:24 +02:00
Andrew Brown
7ce2864d3a add flora to contexts 2017-07-31 03:37:15 +02:00
Andrew Brown
63d4c442cc Add content changelogs #migration 2017-07-14 13:36:32 +02:00
Andrew Brown
e3f3c02ea4 Properly show custom fields with a slash in the name 2017-05-23 19:34:53 +00:00
Andrew Brown
30196b2d9b Little helpful hand on custom attributes/categories 2017-04-13 00:16:10 +01:00
Andrew Brown
1a158fd0d5 Better paragraph/list styling for MD content 2017-04-11 20:57:30 +01:00
Andrew Brown
8477722d60 Don't include nil content 2017-03-30 19:52:28 +01:00
Andrew Brown
3e46f4ee35 Just in case of 500s 2017-03-26 20:48:42 +01:00
Andrew Brown
8c960fc582 Content linking dropdowns no longer exclude same-id/different-class options, fixes #193 2017-03-26 18:11:20 +01:00
Andrew Brown
7e782f7c40 Add languages link to locations 2017-03-26 17:44:52 +01:00
Andrew Brown
84aad22bdd Race context aggregates 2017-03-26 17:38:17 +01:00
Andrew Brown
848778bb54 Improve title on catchall relations with only 1 relation 2017-03-26 17:33:42 +01:00
Andrew Brown
094cce9160 Token replacements in location context cards 2017-03-26 17:22:15 +01:00
Andrew Brown
477723cfc3 Language context 2017-03-26 17:09:53 +01:00
Andrew Brown
f37639aed4 Item context aggregates 2017-03-26 17:09:05 +01:00
Andrew Brown
e25329cb82 Clean up catchall context references 2017-03-26 17:06:20 +01:00
Andrew Brown
ebecbbeee6 Polish character context aggregates 2017-03-26 17:00:55 +01:00
Andrew Brown
833d1aea22 Abstract context relations to generalized partial 2017-03-26 16:33:05 +01:00
Andrew Brown
94f74236da Context aggregate cards for characters 2017-03-26 16:18:30 +01:00
Andrew Brown
08a1eba345 Other contexts 2017-03-25 01:39:52 +00:00
Andrew Brown
1aa28f47f1 Item context 2017-03-25 01:30:16 +00:00
Andrew Brown
b56f095439 Location context 2017-03-25 01:22:58 +00:00
Andrew Brown
bdb8bc6f3d Character context cards 2017-03-25 01:02:59 +00:00
Andrew Brown
ddf9ba33e7 Normalize card heights for in-universe cards 2017-03-24 23:36:22 +00:00
Andrew Brown
7824f9150a Add mixpanel a/b logging for sidebar vs fab save button clicks 2017-03-02 16:55:10 +00:00
Andrew Brown
94a2299654 Oops, added style to wrong image :) 2017-03-01 18:15:38 +00:00
Andrew Brown
2f482b81cd Define a minimum width for the left column in quick-reference table 2017-03-01 16:23:55 +00:00
Andrew Brown
44c0094973 Extra links on quick-review 2017-03-01 02:27:12 +00:00
Andrew Brown
aef4333264 Style dashboard custom images to specific height 2017-02-28 22:57:32 +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
da57291546 Show content images on the dashboard if they exist... SOMETIMES 2017-02-28 22:26:29 +00:00
Andrew Brown
7a80729408 Polish for mobile new/edit 2017-02-28 17:05:12 +00:00
Andrew Brown
a49244ad03 dashboard tweaks 2017-02-28 16:56:27 +00:00
Andrew Brown
a6316559d7 Also check if user is signed in for edit actions 2017-02-27 19:35:04 +00:00
Andrew Brown
3333415b1d Show attribute values for logged-out users 2017-02-27 19:08:24 +00:00
Andrew Brown
93e3edde91 Show all fields on user content, even if they're blank 2017-02-27 17:58:23 +00:00
Andrew Brown
3595ef7291 Show custom tabs on public content even if user isn't logged in 2017-02-27 17:54:57 +00:00
Andrew Brown
e95d306a43 styling & responsiveness on dashboard 2017-02-24 17:43:05 +00:00
Andrew Brown
eb934ba59d WIP dashboard designs 2017-02-23 23:05:47 +00:00
Andrew Brown
a07b3126c1 FABs and other form UI improvements 2017-02-23 17:56:07 +00:00
Andrew Brown
cd3b606741 Style content#new and content#edit to use the same design as content#show 2017-02-23 16:55:43 +00:00
Andrew Brown
fff5abf02e Style share modal 2017-02-23 14:41:02 +00:00
Andrew Brown
947bed198d Style custom attributes/fields modal 2017-02-23 14:24:35 +00:00
Andrew Brown
377ec0453f Polish up content#show 2017-02-23 13:40:38 +00:00
Andrew Brown
9c58fd9d3c Hook up panel links on content#show 2017-02-21 21:21:20 +00:00
Andrew Brown
2dc3883c5b abstract out some partials #wip 2017-02-21 20:30:00 +00:00
Andrew Brown
041813d8e2 WIP design tweaks for dashboard and content#show pages 2017-02-21 20:01:45 +00:00
Andrew Brown
e5f6cc914a Add mixpanel tracking for recent activity clicks and serendipitous questions 2017-02-21 17:30:02 +00:00
Andrew Brown
19f5ff03a4 Show content list banners even when users don't have any content of that type 2017-02-20 19:50:07 +00:00
Andrew Brown
a90f042caa Allow uploading more than 2 images at a time 2017-02-20 17:46: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
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
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
b211f7974f Style gallery edit partial 2017-02-17 23:29:49 +00:00
Andrew Brown
1b1fae1bb7 Show uploaded image galleries on content show pages 2017-02-17 23:01:09 +00:00
Andrew Brown
4c0cd9a1f1 Style image upload 2017-02-17 22:52:24 +00:00
Andrew Brown
d072a4c730 Show uploaded images on Gallery tab 2017-02-17 22:25:16 +00:00
Andrew Brown
bb01a25614 Upload images to S3 2017-02-17 21:03:29 +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
099b252e8e Add gallery tab to characters 2017-02-16 20:04:18 +00:00
Andrew Brown
46b8b93c83 Don't show upgrade CTA on extended content if you're on premium 2017-02-15 19:01:09 +00:00
Andrew Brown
798ac705ed Clean up content panel actions + allow expanding all tabs at once 2017-02-14 19:58:27 +00:00
Andrew Brown
84d3407a31 Don't include the current content in content linking dropdowns, closes #11 2017-02-06 14:47:51 +00:00
Andrew Brown
93f280f86f Use global markdown rendering singleton, closes #148 2017-02-06 14:36:17 +00:00
Andrew Brown
7d1d3f176d Show all included content types on universe#show, not just core types 2017-02-03 15:11:34 +00:00
Andrew Brown
432058c856 Don't show quick-add for universes 2017-01-21 18:18:44 +00:00
Andrew Brown
b5f4a3795f Link 'create your first x' buttons on extended/collective content to subscription page 2017-01-21 18:13:16 +00:00
Andrew Brown
187e3d4a87 Link users to subscription page instead of browser:back when they don't have permission to create content 2017-01-21 18:05:26 +00:00
Andrew Brown
5afa2e9f9a Only show quick-add form if user has permission to do so 2017-01-21 17:51:06 +00:00
Andrew Brown
be8d908a80 Move quick add form to partial + allow core content created by anyone 2017-01-21 17:46:53 +00:00
Andrew Brown
a5e484bc1d Couple o' todos 2017-01-20 17:19:28 +00:00
Andrew Brown
990a306b48 Link back to content index pages on content#show by clicking on content type icon 2016-12-26 18:03:53 +01:00
Steven Wallace
a57459a14e Make content links open in a new tab 2016-11-26 12:43:05 -06:00
Andrew Brown
3b84989321 Show modals again, function method changed apparently 2016-11-06 16:48:42 +01:00
Andrew Brown
48cf0a2ea5 Scope content linking dropdowns to universe when scoped 2016-11-06 15:48:23 +01:00
Andrew Brown
01cf89af04 Clear template description when quick-adding content 2016-11-06 15:29:27 +01:00
Andrew Brown
28fde85db6 Fix hidden tabs on content#show 2016-11-06 15:18:48 +01:00
Andrew Brown
a49ddb2717 Show markdown list formatting in content fields -- fixes #154 2016-11-06 01:47:47 +01:00
Andrew Brown
b2837d4759 Fix quick-add not passing through name value 2016-11-06 01:11:22 +01:00
Andrew Brown
ac28ebffda Quick-add ux improvements 2016-11-02 14:50:40 +01:00
Andrew Brown
fbc68af450 Quick-add content into the current universe scope if it exists 2016-11-02 14:35:13 +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
Andrew Brown
698a92068f Merge branch 'markdown' into content-expansion 
Conflicts:
	app/assets/stylesheets/forms.css
	app/assets/stylesheets/landing.scss
	app/views/content/show.html.erb
 2016-11-01 12:22:22 +01:00
Andrew Brown
f052073373 PR feedback 2016-11-01 12:13:15 +01:00
Matthew Werner
72c66a60cb Attribute Field Dropdowns 2016-10-31 16:32:41 -07:00
Andrew Brown
2f1cf8a9bf Mobile UI polish 2016-10-31 23:40:08 +01:00
Andrew Brown
8fe3e186c6 Add updated pricing plans to landing page 2016-10-31 21:35:42 +01:00
Andrew Brown
08846a0607 Add quick-add form to all content types to create name-only from index page 2016-10-30 21:01:54 +01: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
cb211edb6b Add translations to relation fields partial 2016-10-24 23:05:40 +02:00
Andrew Brown
657be159c7 Minor dashboard/sidebar styling 2016-10-24 15:10:31 +02:00
Andrew Brown
774d1043f6 Fix sidebar on logged-out pages 2016-10-21 23:38:47 +02:00
Andrew Brown
421a7d717b Match content submit buttons to content type colors 2016-10-21 15:51:48 +02:00
Andrew Brown
157dc9b5a0 Translations and serendipitous questions for creatures 2016-10-21 14:20:23 +02:00
Andrew Brown
8e33e227b2 add new content to dashboard 2016-10-19 00:30:57 +02:00
Andrew Brown
69f6a7cbf0 Graphical headers on content index pages 2016-10-19 00:20:46 +02:00
Andrew Brown
848f796a5c Merge branch 'master' into content-expansion 
Conflicts:
	app/assets/stylesheets/navbar.css
 2016-10-16 23:15:48 +02:00
Andrew Brown
c5c9298e1c Merge branch 'master' into issue-121 2016-10-16 21:19:39 +02:00
Mitchel Pigsley
4f77f612e2 Add new lines to forms.css and realation_input 2016-10-15 21:13:41 -05:00
Mitchel Pigsley
80fa7c4d94 Wrap relation input correctly by sizing to normal input height 2016-10-15 10:10:29 -05: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
Andrew Carreiro
e74b41f422 Adding a few keyboard commands as well as a simple dialog to give help 2016-10-14 00:46:03 -04:00
Andrew Brown
6d3c36a888 Render notebook fields with markdown on content#show pages 2016-10-12 00:28:04 +02:00
Mitchel Pigsley
a39fe0e9b6 Apply styling to select wrappers to match text input spacing 2016-10-11 08:52:08 -05:00
Andrew Brown
5df1099038 remove redundant line 2016-10-11 11:48:12 +02:00
Andrew Brown
1f3e7964b7 Add smarter placeholders to content forms 2016-10-11 11:45:00 +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
9ddcb31489 Add button to add more content at the top of content#index pages 2016-10-05 14:15:36 +02:00
Ashley Sullins
eb281b6165 Add archetype to character information 2016-10-02 22:24:52 -05:00
Andrew Brown
6d08285a72 Disable share on content#edit, add confirmation dialog to deleting content 2016-10-01 17:46:32 +02:00
Andrew Brown
8f6f2ebc5f Remove bug that slipped in too #yolo 2016-09-30 19:07:48 +02:00
Andrew Brown
8ca219c605 Only show edit links on content list to owner 2016-09-30 02:33:15 +02:00
Andrew Brown
b8496e9dc7 Fix skintone test 2016-09-29 21:40:30 +02:00
Andrew Brown
96be59d85b dashboard, footer, and misc polish 2016-09-29 21:35:43 +02:00
Andrew Brown
258a9b23fb sidebar polish 2016-09-29 20:04:44 +02:00
Andrew Brown
dd6c8789bf Content show page polish / autocomplete hooks 2016-09-29 19:57:42 +02:00
Andrew Brown
321f382999 navbar polish for mobile responsiveness 2016-09-29 17:54:39 +02:00
Andrew Brown
c89a7625cf content show page polish 2016-09-29 17:31:18 +02:00
Andrew Brown
6cfa555da0 Author profile page polish 2016-09-29 16:57:53 +02:00
Andrew Brown
cf33c18c7c Content index page polishes 2016-09-29 16:28:18 +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
7c0b7b7b90 take datetimes out of card tables for focus on content 2016-09-29 00:49:38 +02:00
Andrew Brown
aa6ac445fd Allow updating privacy field on content 2016-09-24 02:55:48 +02:00
Andrew Brown
6d68184ec1 Better utilize whitespace on content#show pages 2016-09-24 01:36:50 +02:00
Andrew Brown
7616906f71 Merge branch 'master' into polish-ui 
Conflicts:
	app/views/content/form/_actions_dropdown.html.erb
 2016-09-24 01:32:05 +02:00
Andrew Brown
2978c38102 Replace sharing toggles with an info message for content visitors 2016-09-23 23:33:11 +02:00
Andrew Brown
c46b8bdcc6 Remove placeholder in dropdown 2016-09-23 23:11:45 +02:00
Robert Richter
bcb60a40dc
Remove "disabled" argument to privacy toggle 2016-09-22 17:25:29 -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
3252962a9f
Clean up share box styles 2016-09-22 13:03:42 -05:00
Robert Richter
ad178d7854
Make privacy toggle send "public" or "private" 2016-09-22 11:33:58 -05:00
Robert Richter
a7441a3b9a
Restructured meta tags 2016-09-21 11:13:44 -05:00
Robert Richter
286d06c60e
Add share buttons and wire them up 2016-09-20 17:09:43 -05:00
Robert Richter
a0ffdc5ee8
Create "Share" modal dialog 
Can only be opened by calling `$('#share-modal').openModal()`
 2016-09-20 11:08:34 -05:00
Robert Richter
b817cdf1fe
Add JSON-LD to Universes 2016-09-06 10:36:16 -05:00
Andrew Brown
5333ddc975 Display universe name on author content 2016-09-06 00:31:50 -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
5897c53760 Humanize relation button texts 2016-09-03 16:32:30 -05:00
Andrew Brown
8f6cc0ee3a Properly show universe content from within universe#show page 2016-08-19 00:44:16 -05:00
Andrew Brown
034cf1198b Don't show private content (e.g. private notes) to other users when content is shared 2016-08-18 17:56:13 -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
01589d75e9 Re-enable serendipitous cards for content#index, contnent#show, and main#dashboard 2016-08-11 00:51:17 -05:00
Andrew Brown
c3561c0ab1 Autopopulate the currently-scoped universe into new content forms 2016-08-11 00:18:26 -05:00
Andrew Brown
c7d752a298 Abstract index.html to content/index view 2016-08-10 22:49:22 -05:00
Andrew Brown
68f22427d8 Restrict long-form css to .long-form containers 2016-08-07 14:46:25 -05:00
Andrew Brown
13f1ee6e6a Use simple_format for long-form content values 2016-08-07 14:40:46 -05:00
Andrew Brown
1f6a49ecfe Only link to universes if they exist 2016-08-06 02:13:21 -05:00
Andrew Brown
10fb5b07f4 Link content pages through to universe they're attached to 2016-08-06 02:04:44 -05:00
Andrew Brown
0654b36ca1 Allow linking content to universes 2016-08-06 01:58:52 -05:00
Andrew Brown
cc9b9601c1 Sort link dropdowns by name 2016-08-05 22:10:32 -05:00
Andrew Brown
22a28d5d3b uh, disregard 2016-08-04 23:05:37 -05:00
Andrew Brown
d04024f7a3 Show content names as page titles when available 2016-08-04 22:41:48 -05:00
Andrew Brown
eda6e72db6 Hook up serendipitous form for simple fields 2016-08-04 20:50:40 -05:00
Andrew Brown
5e64920cbb Fix content link dropdowns (git statusgit status) 2016-08-04 19:43:33 -05:00
Andrew Brown
150200812f Dat polish tho 2016-08-04 00:51:48 -05:00
Andrew Brown
c809b3ed9c Character birthplace / tweaking for Character-->Location relations 2016-05-03 15:46:58 -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
5c67f76b21 Abstract out siblingships into relation 2016-05-03 12:54:02 -05:00
Andrew Brown
e7c9f6c0c9 Code cleanup 2016-05-03 12:09:18 -05:00
Andrew Brown
18d058aa88 Polishing up siblingship UI 2016-05-03 11:56:57 -05:00
Andrew Brown
4300bf492a Edit siblingships/relations from #_form 2016-05-02 19:37:37 -05:00
Andrew Brown
02b447c4e0 Populate relation options in dropdown 2016-05-02 13:11:11 -05:00
Andrew Brown
8e0a5113d1 Add chips on content#_form 2016-05-02 11:44:09 -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
af01d6e451 routes cleanup 2016-04-30 14:25:08 -05:00
Andrew Brown
80e0a7228f Relation autocomplete plumbing 2016-04-30 13:06:22 -05:00