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

262 Commits

Author SHA1 Message Date
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
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
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
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
74e13dd69b mock disabled redirection to subscription path on cant_create(content) on dashboard 2019-01-05 21:06:30 -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
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
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
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
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
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
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
02d5454bfa allow un-deleting documents 2018-10-18 13:58:52 -05:00
Andrew Brown
c07c1036b6 add documents permissions + deletion logic frame 2018-10-18 13:23:06 -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
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
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
833199dfc6 minor fixes 2018-09-16 21:17:44 -05:00
Andrew Brown
78daa1e9dd fix migration for existing users 2018-09-10 20:06:09 -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
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
ec67c23b7d address deprecations 2018-07-05 01:35:40 -05:00
Andrew Brown
a59d7bf2e8 Downcase contributor emails to make them case insensitive 2018-01-25 17:15:31 -06:00
Andrew Brown
c7b1baaffd content#index and sidenav optimizations 2018-01-15 23:52:57 -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
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
fb602b7d95 Fix tests that were creating a universe with no user 2017-10-01 12:21:53 +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
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
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
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
ce6dda81b6 Add worldbuilding prompts page 2017-04-11 17:47:47 +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
d2c310fe0f Differentiate between redirecting to content and looking at content 2017-02-27 19:41:41 +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
963769e3c9 Add mixpanel action tracking for all server actions 2017-02-21 17:12:43 +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
96e0a60ea9 Subtract account bandwidth on upload, refund on delete 2017-02-18 02:24:38 +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
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
Andrew Brown
8ae77f4b67 Implement authority for user permissions 2017-01-14 00:06:33 +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
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
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
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
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
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
db54e3f11f Don't wipe universe on content create #bugfix 2016-09-03 16:27:01 -05:00
Robert Richter
af7af4a3e2
Rubocop auto-correct 2016-08-26 14:56:52 -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
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
01589d75e9 Re-enable serendipitous cards for content#index, contnent#show, and main#dashboard 2016-08-11 00:51:17 -05:00
Andrew Brown
7271ec72f1 Don't filter universe by universe 2016-08-10 23:50:40 -05:00
Andrew Brown
3c662a8ef6 Universe scoping! 2016-08-10 23:43:11 -05:00
Andrew Brown
417213b130 Allow filtering content by universe 2016-08-10 22:59:51 -05:00
Andrew Brown
e571b2e50f Don't throw a 500 if we can't generate a question about content, just don't ask the question 2016-08-06 02:15:54 -05:00