From a768ee8e2df1e0bae3c5e7604b972cdb77fc8afb Mon Sep 17 00:00:00 2001 From: Pavel Vyazovoi Date: Mon, 4 Aug 2014 12:22:01 +0600 Subject: [PATCH 1/5] composer.json with component-installer --- composer.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..36450bd --- /dev/null +++ b/composer.json @@ -0,0 +1,30 @@ +{ + "name": "components/bootstrap-wysihtml5", + "description": "wysiwyg editor for bootstrap2 (forked from jhollingworth/bootstrap-wysihtml5)", + "type": "component", + "keywords": ["wysiwyg", "editor", "bootstrap", "bootstrap2", "yii", "extension"], + "license": "MIT", + "version": "0.0.3", + "authors": [ + { + "name": "Pavel Vyazovoi", + "email": "paul@elms.pro" + }, + { + "name": "James Hollingworth", + "email": "jamiehollingworth@gmail.com" + } + ], + "extra": { + "name": "bootstrap-wysihtml5", + "component": { + "files": [ + "./src/**", + "./lib/**", + ] + } + }, + "require": { + "robloach/component-installer": "*" + } +} From b2b5a4b3c571d542229123791c6af0e9edf9af94 Mon Sep 17 00:00:00 2001 From: Pavel Vyazovoi Date: Mon, 4 Aug 2014 12:25:08 +0600 Subject: [PATCH 2/5] name fixed --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 36450bd..56b289b 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "components/bootstrap-wysihtml5", + "name": "vyazovoi/bootstrap-wysihtml5", "description": "wysiwyg editor for bootstrap2 (forked from jhollingworth/bootstrap-wysihtml5)", "type": "component", "keywords": ["wysiwyg", "editor", "bootstrap", "bootstrap2", "yii", "extension"], From ca9f0606b0a29906ff72fc13ba59628f8322761e Mon Sep 17 00:00:00 2001 From: Pavel Vyazovoi Date: Mon, 4 Aug 2014 13:11:22 +0600 Subject: [PATCH 3/5] fixed typo in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 56b289b..4ea73f8 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "component": { "files": [ "./src/**", - "./lib/**", + "./lib/**" ] } }, From 8ff64e7be5146814d3f201595b823be73605e213 Mon Sep 17 00:00:00 2001 From: Pavel Vyazovoi Date: Mon, 4 Aug 2014 13:59:40 +0600 Subject: [PATCH 4/5] added link.target for russian locale --- src/locales/bootstrap-wysihtml5.ru-RU.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/locales/bootstrap-wysihtml5.ru-RU.js b/src/locales/bootstrap-wysihtml5.ru-RU.js index f2c4397..ec37df8 100644 --- a/src/locales/bootstrap-wysihtml5.ru-RU.js +++ b/src/locales/bootstrap-wysihtml5.ru-RU.js @@ -22,7 +22,8 @@ }, link: { insert: "Вставить ссылку", - cancel: "Отмена" + cancel: "Отмена", + target: "В новом окне" }, image: { insert: "Вставить изображение", From 8b27c4ba6c846c17a6a68c8661362f822f70b9c2 Mon Sep 17 00:00:00 2001 From: Pavel Vyazovoi Date: Mon, 4 Aug 2014 14:13:20 +0600 Subject: [PATCH 5/5] Revert: moving composer.json to new branch This reverts commit a768ee8e2df1e0bae3c5e7604b972cdb77fc8afb. --- composer.json | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 composer.json diff --git a/composer.json b/composer.json deleted file mode 100644 index 4ea73f8..0000000 --- a/composer.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "vyazovoi/bootstrap-wysihtml5", - "description": "wysiwyg editor for bootstrap2 (forked from jhollingworth/bootstrap-wysihtml5)", - "type": "component", - "keywords": ["wysiwyg", "editor", "bootstrap", "bootstrap2", "yii", "extension"], - "license": "MIT", - "version": "0.0.3", - "authors": [ - { - "name": "Pavel Vyazovoi", - "email": "paul@elms.pro" - }, - { - "name": "James Hollingworth", - "email": "jamiehollingworth@gmail.com" - } - ], - "extra": { - "name": "bootstrap-wysihtml5", - "component": { - "files": [ - "./src/**", - "./lib/**" - ] - } - }, - "require": { - "robloach/component-installer": "*" - } -}