Merge branch 'release-1.2.0'

oat-sa · Feb 17, 2022 · 2a1725a · 2a1725a
2 parents b2785f1 + 2952b10
commit 2a1725a
Show file tree

Hide file tree

Showing 34 changed files with 23 additions and 23 deletions.
diff --git a/lib/ckeditor/ckeditor.js b/lib/ckeditor/ckeditor.js
diff --git a/lib/ckeditor/lang/ja.js b/lib/ckeditor/lang/ja.js
diff --git a/lib/ckeditor/plugins/icons.png b/lib/ckeditor/plugins/icons.png
diff --git a/lib/ckeditor/plugins/icons_hidpi.png b/lib/ckeditor/plugins/icons_hidpi.png
diff --git a/lib/ckeditor/plugins/taomediamanager/lang/ja.js b/lib/ckeditor/plugins/taomediamanager/lang/ja.js
@@ -0,0 +1 @@
+CKEDITOR.plugins.setLang("insertMedia","ja",{button:"メディア挿入",title:"メディア挿入"});
diff --git a/lib/ckeditor/plugins/taomediamanager/plugin.js b/lib/ckeditor/plugins/taomediamanager/plugin.js
diff --git a/lib/ckeditor/skins/kama/editor.css b/lib/ckeditor/skins/kama/editor.css
diff --git a/lib/ckeditor/skins/kama/editor_ie.css b/lib/ckeditor/skins/kama/editor_ie.css
diff --git a/lib/ckeditor/skins/kama/editor_ie7.css b/lib/ckeditor/skins/kama/editor_ie7.css
diff --git a/lib/ckeditor/skins/kama/editor_ie8.css b/lib/ckeditor/skins/kama/editor_ie8.css
diff --git a/lib/ckeditor/skins/kama/editor_iequirks.css b/lib/ckeditor/skins/kama/editor_iequirks.css
diff --git a/lib/ckeditor/skins/kama/icons.png b/lib/ckeditor/skins/kama/icons.png
diff --git a/lib/ckeditor/skins/kama/icons_hidpi.png b/lib/ckeditor/skins/kama/icons_hidpi.png
diff --git a/lib/ckeditor/skins/moono-lisa/editor.css b/lib/ckeditor/skins/moono-lisa/editor.css
diff --git a/lib/ckeditor/skins/moono-lisa/editor_gecko.css b/lib/ckeditor/skins/moono-lisa/editor_gecko.css
diff --git a/lib/ckeditor/skins/moono-lisa/editor_ie.css b/lib/ckeditor/skins/moono-lisa/editor_ie.css
diff --git a/lib/ckeditor/skins/moono-lisa/editor_ie8.css b/lib/ckeditor/skins/moono-lisa/editor_ie8.css
diff --git a/lib/ckeditor/skins/moono-lisa/editor_iequirks.css b/lib/ckeditor/skins/moono-lisa/editor_iequirks.css
diff --git a/lib/ckeditor/skins/moono-lisa/icons.png b/lib/ckeditor/skins/moono-lisa/icons.png
diff --git a/lib/ckeditor/skins/moono-lisa/icons_hidpi.png b/lib/ckeditor/skins/moono-lisa/icons_hidpi.png
diff --git a/lib/ckeditor/skins/moono/editor.css b/lib/ckeditor/skins/moono/editor.css
diff --git a/lib/ckeditor/skins/moono/editor_gecko.css b/lib/ckeditor/skins/moono/editor_gecko.css
diff --git a/lib/ckeditor/skins/moono/editor_ie.css b/lib/ckeditor/skins/moono/editor_ie.css
diff --git a/lib/ckeditor/skins/moono/editor_ie7.css b/lib/ckeditor/skins/moono/editor_ie7.css
diff --git a/lib/ckeditor/skins/moono/editor_ie8.css b/lib/ckeditor/skins/moono/editor_ie8.css
diff --git a/lib/ckeditor/skins/moono/editor_iequirks.css b/lib/ckeditor/skins/moono/editor_iequirks.css
diff --git a/lib/ckeditor/skins/moono/icons.png b/lib/ckeditor/skins/moono/icons.png
diff --git a/lib/ckeditor/skins/moono/icons_hidpi.png b/lib/ckeditor/skins/moono/icons_hidpi.png
diff --git a/lib/ckeditor/skins/tao/editor.css b/lib/ckeditor/skins/tao/editor.css
diff --git a/lib/ckeditor/skins/tao/editor.css.map b/lib/ckeditor/skins/tao/editor.css.map
diff --git a/lib/ckeditor/skins/tao/icons.png b/lib/ckeditor/skins/tao/icons.png
diff --git a/lib/ckeditor/skins/tao/icons_hidpi.png b/lib/ckeditor/skins/tao/icons_hidpi.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-shared-libs",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "description": "TAO Frontent Core Shared Libraries",
     "files": [
         "lib"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CKEDITOR.plugins.setLang("insertMedia","ja",{button:"メディア挿入",title:"メディア挿入"});