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
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
Andrew Brown
c611022f1d Recognize associations on content#edit 2016-04-30 12:21:32 -05:00
Andrew Brown
b065cd8908 Link to siblings in Character#show 2016-04-29 16:11:02 -05:00
Andrew Brown
753e843972 content views polish 2016-04-27 18:46:07 -05:00
Andrew Brown
8a89519c5e Content#edit restyling with tabs 2016-04-27 18:29:57 -05:00
Andrew Brown
0fc8585127 Content#show restyling with tabs 2016-04-27 17:13:53 -05:00
Andrew Brown
6cfd0e06af Show serendipitous card base 2016-04-25 22:04:00 -05:00
Andrew Brown
e1d9694690 Sidebar partial refactoring 2016-04-25 13:12:11 -05:00
Andrew Brown
afcb02036e clean up redundancy 2016-04-07 02:30:38 -05:00
Andrew Brown
4ef11e8563 Legal imagesgit status 2016-04-07 01:50:34 -05:00
Andrew Brown
e56fddeeac Index and sidebar revamps for all 2016-04-07 00:35:50 -05:00
Andrew Brown
8cb416c04b shows and forms for everything 2016-04-07 00:06:15 -05:00
Andrew Brown
467cf6e33d Abstract new/edit forms to content model 2016-04-06 23:30:14 -05:00
Andrew Brown
6ad0acf524 Start abstracting index views 2015-09-03 22:11:33 -05:00