Changeset [1d301a2e9a881b8228c87e3d04a8159f094a6398] by tanabe
Revision 1d301a2e9a881b8228c87e3d04a8159f094a6398,
committed by tanabe
· December 8th, 2008 @ 06:04 PM
Merge git@github.com:nabeta/next-l
Conflicts:
app/views/baskets/index.html.erb
app/views/bookmarked_resources/_index.html.erb
app/views/bookmarks/_index_bookmarked_resource.html.erb
app/views/checked_items/_checkouts.html.erb
app/views/checked_items/_list.html.erb
app/views/checkouts/_list.html.erb
app/views/creates/_index.html.erb
app/views/creates/_index_work.html.erb
app/views/donates/index.html.erb
app/views/events/index.html.erb
app/views/inventories/index.html.erb
app/views/item_has_use_restrictions/index.html.erb
app/views/items/_index_inventory_file.html.erb
app/views/order_lists/index.html.erb
app/views/owns/index.html.erb
app/views/page/acquisition.html.erb
app/views/produces/_index.html.erb
app/views/produces/_produces.html.erb
app/views/realizes/_index.html.erb
app/views/reserves/index.html.erb
app/views/roles/index.html.erb
config/locales/en.yml
config/locales/ja.yml
git-svn-id: http://kamata.lib.teu.ac.jp/svn/... a1694bff-af8b-4939-a0ce-5261704d896c http://github.com/nabeta/next-l/...
23 changed files
-
M
app/views/baskets/index.html.erb -
M
app/views/bookmarked_resources/_index.html.erb -
M
app/views/bookmarks/_index_bookmarked_resource.html.erb -
M
app/views/checked_items/_checkouts.html.erb -
M
app/views/checked_items/_list.html.erb -
M
app/views/checkouts/_list.html.erb -
M
app/views/creates/_index.html.erb -
M
app/views/creates/_index_work.html.erb -
M
app/views/donates/index.html.erb -
M
app/views/events/index.html.erb -
M
app/views/inventories/index.html.erb -
M
app/views/item_has_use_restrictions/index.html.erb -
M
app/views/items/_index_inventory_file.html.erb -
M
app/views/order_lists/index.html.erb -
M
app/views/owns/index.html.erb -
M
app/views/page/acquisition.html.erb -
M
app/views/produces/_index.html.erb -
M
app/views/produces/_produces.html.erb -
M
app/views/realizes/_index.html.erb -
M
app/views/reserves/index.html.erb -
M
app/views/roles/index.html.erb -
M
config/locales/ja.yml -
M
script/reindex_solr_all.rb