Commit Graph

124 Commits

Author SHA1 Message Date
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