Commit Graph

8 Commits

Author SHA1 Message Date
Andrew Brown
7a80729408 Polish for mobile new/edit 2017-02-28 17:05:12 +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
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
737273d2ae Single image uploading, needs processing in controller 2017-02-17 01:41:41 +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
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
1f4198828a Clean up redundant views 2016-10-14 23:34:59 +02:00