OSDN Git Service

merge v04
authoryasushiito <yas@pen-chan.jp>
Sat, 21 Jul 2012 00:29:37 +0000 (09:29 +0900)
committeryasushiito <yas@pen-chan.jp>
Sat, 21 Jul 2012 00:29:37 +0000 (09:29 +0900)
commitd06c85598de5091129d22bfdcc650fae261a6219
tree1b835d537513d42c21fcddf0b2958459ae2fb3d8
parent1a2fb1c39c1f373494a584eb3cb54adb7a733375
parent7da6c008e9358396e0bc696e6ee47e4b5e8488f6
merge v04
25 files changed:
app/controllers/comics_controller.rb
app/controllers/original_pictures_controller.rb
app/models/original_picture.rb
app/models/panel_picture.rb
app/views/resource_pictures/index.html.erb
app/views/system/browse.html.erb
config/routes.rb
spec/cli/u/comics/create.json
spec/cli/u/original_pictures/create.json
spec/cli/u/panels/create.json
spec/cli/u/stories/create.json
spec/controllers/comics_controller_spec.rb
spec/controllers/original_pictures_controller_spec.rb
spec/controllers/panel_pictures_controller_spec.rb
spec/controllers/panels_controller_spec.rb
spec/controllers/stories_controller_spec.rb
spec/factories.rb
spec/models/balloon_spec.rb
spec/models/comic_spec.rb
spec/models/original_picture_spec.rb
spec/models/panel_picture_spec.rb
spec/models/panel_spec.rb
spec/models/speech_balloon_spec.rb
spec/models/speech_spec.rb
spec/models/story_spec.rb