Commit Graph

8 Commits

Author SHA1 Message Date
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
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
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
421a7d717b Match content submit buttons to content type colors 2016-10-21 15:51:48 +02:00
Andrew Brown
1f4198828a Clean up redundant views 2016-10-14 23:34:59 +02:00