refs 6988 modified submenu layout
numbering_types form to select2
Merge remote-tracking branch 'origin/master'
modified bug
シリーズ登録画面のレイアウト崩れの修正
Merge remote branch 'origin/master' into issue6675
refs 6921 資料の編集画面の言語フォームをSelect2フォームへ改良

言語のフォームをSelect2に対応させて、検索ができるように改良した。
フォームの追加を行った時に多少フォームがずれる。
refs 6992 書誌の登録時 user を持たない agent を選択するように修正
Merge remote-tracking branch 'origin/issue6992'
Merge remote branch 'origin/master' into issue6675
creator_types form to Select2
refs 6688 書誌と所蔵を１：１で管理する設定の時の対応

設定がはいの時には所蔵の情報も書誌の表示画面にまとめて表示する。
所蔵の登録時のvalidate（既に登録されている時にエラーとする）は
いいえの設定の場合にもチェックされてしまい、対応策が見つからない為、
保留にしています。

commit 851724bb7138cd30d54047f1840171360c1afd2b
Merge: 807fe66 315b476
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Apr 7 15:50:16 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6688

commit 807fe666c7d4dae7d767154f764465c1e1341a0d
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 18 17:05:02 2014 +0900

    add word

commit 9f393554246541acf401cce7a00e5850fb0a505a
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 18 16:01:01 2014 +0900

    登録・更新日時に TODO 追加

commit a584a6324f25cb9e1a52210fe89c0d96f9ac0d2e
Merge: 9e657f5 b4df5bf
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 18 15:45:50 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6688

commit 9e657f58bfa678410f5cee9764926d6b8413dfb9
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 18 15:45:18 2014 +0900

    manifestation の show を修正

commit 5188f368c7056d0f45fa5aa3afbfaf089befad34
Merge: 58ee555 9c7d97f
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 18 09:25:29 2014 +0900

    modified conflict

commit 58ee5554edddfe90603fd49ac60a97c90062b331
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Mar 17 17:44:54 2014 +0900

    manifestationのshow画面の修正

commit dcbbf3839975df3f0e86c4ed66f8a8a9aca2d89b
Merge: 0270e72 2c50ea2
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Mar 17 09:23:06 2014 +0900

    modified conflict

commit 0270e7212717f77ea19d4c0eb84b7e479ce4e7be
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Mar 14 16:59:50 2014 +0900

    modified error

commit 5c9b37d93756e66fdaefbb28bb5447c9d9e1a657
Merge: b82c138 55bcbae
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Mar 14 09:07:21 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6688

commit b82c138415ad3ea22026c6aded65110ede52c0f3
Merge: 379f6b1 694cbf6
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Mar 13 17:43:45 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6688

commit 379f6b1a19481fed469416d0d94af15d9b6934d8
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Mar 13 17:43:22 2014 +0900

    add exemplify=所蔵

commit a024e2e82695f89f873781e8450b999d54b91e34
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Mar 13 17:39:42 2014 +0900

    modified message

commit 95e33a14aa5912d97b0b08f208030bf7b7118dad
Merge: 39303b5 60be057
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Mar 13 09:09:23 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6688

commit 39303b59fec20d1a44efd05b1ad0514ca2d8f9b3
Merge: a7c1afd ed89df9
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Wed Mar 12 17:38:02 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6688

commit a7c1afd47b4ce306f3a093d8f568269e76eccea3
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Wed Mar 12 17:35:58 2014 +0900

    modified error message

commit baf85aec53cd3b7dc96dc549ceaf4e309d238f77
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Wed Mar 12 15:40:39 2014 +0900

    modified items_controller.create

commit 9a49971f598953e457844947b373fe07b73c007b
Merge: 526a6c5 683d5ef
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Wed Mar 12 09:11:47 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6688

commit 526a6c5df9f6f948b9dd1d644f542e869e8dbfbf
Merge: bc98e2a d1f9215
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 11 17:42:41 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6688

commit bc98e2abd3a4da71135d12c997bce12bc2bdf98a
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 11 17:42:23 2014 +0900

    add uniqueness

commit c544a2f0629008e403ae2e42d3721a07ee868fcf
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 11 09:46:26 2014 +0900

    delete needless code

commit 40d9e704b0c3da4e53314d5d71cf77865e87877b
Merge: 9ffc040 f5d6cc6
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 11 09:12:40 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6553

commit 9ffc0402a3e980fd476c85b3b4b46152b20705eb
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Mar 10 17:19:53 2014 +0900

    add error/success messages

commit 285d9324d486ce4018a588a86569a8dc60ec16e2
Merge: 83e7cfc 46070c1
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Mar 10 09:12:55 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6553

commit 83e7cfce87d5462d7b806f60e8b288ed330fee55
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Mar 7 18:25:22 2014 +0900

    add error message

commit b97470a2d7173b0a7878de150753dc4e03d5187b
Merge: 0b1bd94 d089c9c
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Mar 7 18:24:05 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6553

commit 0b1bd9465e292e422209d5d30b54f74917a6f564
Merge: 448861f 216c298
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Mar 7 09:00:00 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6553

commit 448861f18662dbe4610b054fbee95afbff3928b9
Merge: 04bc300 26fc42d
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Mar 6 17:48:27 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6553

commit 04bc3008c3777efd4df40ce5061c6ebfeb53460c
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Mar 6 17:48:08 2014 +0900

    通貨レート反映フォーム作成

commit d1a280820467f94244a4fe39a08ef515bfcfe447
Merge: ee0013a 5804781
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Mar 6 09:33:06 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6553

commit ee0013a6e61f096de2f65a3933f4310a0874ccf9
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Wed Mar 5 17:03:07 2014 +0900

    currency_id へ uniqueness 追加

commit 736153c60c02481ed49801629c60e1609eccd13d
Merge: add5ea4 69b1872
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Wed Mar 5 09:17:43 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6553

commit add5ea42d27b0e224aee0702b5cc549bbc2da936
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 4 17:48:35 2014 +0900

    ファセットの作成開始

commit 37824db649f6de19152f51bd610eebe68475652e
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 4 17:44:42 2014 +0900

    ファセットの作成開始

commit d3f1863ae9f6bfa1db13a4aa17c4a1dd33b55a87
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 4 16:32:54 2014 +0900

    検索フォームの実装

commit 386982b6ac4bfd6ddb2201419b445fb0fcc2c873
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 4 09:23:59 2014 +0900

    通貨レートの検索実装中

commit 0bf6b69ced3701da45d6d9d4e79660f44a29e80a
Merge: 68f553e 76bd5ad
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Mar 4 09:21:21 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6553

commit 68f553e9d06f051c32da4252ee35c3c38cfe6bb6
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Mar 3 10:53:17 2014 +0900

    item画面への反映

commit 6f92f362d0c415d64d69151118cd159d4fc96fc1
Merge: e4447cd 83f9b24
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Mar 3 09:08:11 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit e4447cdcc71b4fd4c5515810cbbe50e994d3ac73
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Feb 28 17:40:53 2014 +0900

    所蔵への select2 実装

commit cf31d826c4b27f755377e1340fbcaa4393f2a3c3
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Feb 28 16:14:18 2014 +0900

    adjust code

commit ce06e2935bfefe238390d5f5791ef36accca2e8a
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Feb 28 16:05:28 2014 +0900

    select2 実装

commit c07b35550f5cc9ed82488114551ac3707717043a
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Feb 28 11:36:20 2014 +0900

    add select2_form

commit fe9a02a9e98a15c1e494dc0175cf3b7de393cd8e
Merge: 657b957 8121a52
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Feb 28 09:03:12 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit 657b9578a1f730f2351f347d1b6afab866d8bcd3
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Feb 27 17:38:43 2014 +0900

    add select2_script & make_select2

commit f59f46d0d123b16ae00103914e1dbf142675c6ea
Merge: 7ea178f ac52b95
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Feb 27 10:09:08 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit 7ea178ffbc1eb54698c80ce0309e6a210a513ce2
Merge: 347a4b4 61ddbaf
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Feb 25 09:01:31 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit 347a4b4650d0c456e337dd48132c8481b7c12ee8
Merge: d2dfd13 454b594
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Feb 24 15:30:57 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit d2dfd13f5fd957ac2d990c80a6acf8f63b2f823f
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Feb 24 15:29:10 2014 +0900

    master merge

commit 8c721835678ac2459c9b685733543d4ed9a3f983
Merge: 495c986 3053f4b
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Feb 21 17:54:21 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit 495c9865f7ca033e832cecb6cc17a46466c550d5
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Feb 21 09:54:04 2014 +0900

    generalize code

commit d779f5514af636d722b2bc692b6ffd9904a42d87
Merge: 8beead5 c7d1f5b
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Feb 20 14:06:44 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit 8beead5af66cc70bc734153125736bbbd8c16fe2
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Feb 20 14:06:22 2014 +0900

    modified form

commit a6bbe51ba0a1971fe719f37b2b613ffac3ca4d2f
Merge: 86517b3 ab3df5b
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Wed Feb 19 12:59:31 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit 86517b347669a5bccb3dee46c25bd22bfb2f8b09
Merge: f1f668f ecf0b28
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Feb 18 17:49:16 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit f1f668ffeeab0b042a8ac012b0b6c644375c433b
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Feb 18 17:48:41 2014 +0900

    carrier_typeフォームの完了

commit ee946ded85afacd59626b9b77c87910efb7cf65e
Merge: bc24f06 15d525f
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Feb 18 09:44:41 2014 +0900

    modified conflict

commit bc24f0610acf7b0f3753402433fa4cb27b02bae5
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Tue Feb 18 09:32:51 2014 +0900

    DBからの取得

commit 4b2dc3f35a44d6674c15ef75a00cfd1facc7d28d
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Feb 14 10:23:54 2014 +0900

    CustomMatcherの反映

commit a2781974379252aa913cc54a794730dc5605bba0
Merge: 2c75377 83b10b5
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Fri Feb 14 10:17:55 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit 2c7537756b3ba45565a4e1ceb5193f17a4e132b7
Merge: 730b654 d2d9b9c
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Feb 13 09:24:46 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit 730b654a00128a53700244f83b5c454f898ee575
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Wed Feb 12 16:34:45 2014 +0900

    項目をDBから取得する

commit 57f0166e7a05e8ccc8f7fc891589e00e6f981004
Merge: fa3fb7c 532d525
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Wed Feb 12 09:13:48 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit fa3fb7caa58cb79a55d9c9dc21032183e2578273
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Feb 10 17:31:56 2014 +0900

    carrier_typeにselect2適用

commit 8dfcd53ef5900e695faccde949d197fa88433ff5
Merge: c161c54 2511e43
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Mon Feb 10 09:18:21 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit c161c54452af260d2a44879d8d594f8648def0b5
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Feb 6 17:19:50 2014 +0900

    試用フォーム作成

commit 8563c624a0c5505c73b77291b5f6faacb51813de
Merge: d3a29fc 46bf4a6
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Feb 6 17:18:18 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit d3a29fc652389ddc309f11c664ba49305830ddcd
Merge: a6fdee9 9e102f8
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Thu Feb 6 09:32:21 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471

commit a6fdee9c2ef6760ae88564429a910030ddf602ec
Merge: 365f766 b9898c3
Author: asoda <asoda.masataka@miraitsystems.jp>
Date:   Wed Feb 5 09:03:12 2014 +0900

    Merge remote-tracking branch 'origin/master' into issue6471
バグ一時対応
refs 6979 libraryテーブルでwebレコードの削除に対応。
Merge branch 'master' into issue6979
refs 6964 modified validate of item_has_operator
Merge remote branch 'origin/master' into issue6675

Conflicts:
	app/controllers/items_controller.rb
	db/fixtures/libraries.yml
refs 6997 シリーズ登録画面の注記ラベル名の変更
modified layout
refs 7016 定期刊行物登録のエラー修正