git.osdn.net Git - nucleus-jp/nucleus-next.git/commit

Merge branch 'skinnable-master'

Conflicts:
action.php
index.php
install/index.php
nucleus/bookmarklet.php
nucleus/convert/functions.inc.php
nucleus/convert/wordpress.php
nucleus/index.php
nucleus/libs/ACTION.php
nucleus/libs/ACTIONLOG.php
nucleus/libs/ACTIONS.php
nucleus/libs/ADMIN.php
nucleus/libs/BAN.php
nucleus/libs/BLOG.php
nucleus/libs/BODYACTIONS.php
nucleus/libs/BaseActions.php
nucleus/libs/COMMENT.php
nucleus/libs/COMMENTACTIONS.php
nucleus/libs/COMMENTS.php
nucleus/libs/ITEM.php
nucleus/libs/ITEMACTIONS.php
nucleus/libs/KARMA.php
nucleus/libs/MANAGER.php
nucleus/libs/MEDIA.php
nucleus/libs/MEMBER.php
nucleus/libs/NOTIFICATION.php
nucleus/libs/PAGEFACTORY.php
nucleus/libs/PARSER.php
nucleus/libs/PLUGIN.php
nucleus/libs/PLUGINADMIN.php
nucleus/libs/SEARCH.php
nucleus/libs/SKIN.php
nucleus/libs/TEMPLATE.php
nucleus/libs/backup.php
nucleus/libs/globalfunctions.php
nucleus/libs/i18n.php
nucleus/libs/include/admin-add.template
nucleus/libs/include/admin-edit.template
nucleus/libs/include/bookmarklet-add.template
nucleus/libs/include/bookmarklet-edit.template
nucleus/libs/showlist.php
nucleus/libs/skinie.php
nucleus/libs/sql/DB.php
nucleus/libs/sql/MYSQLPDO.php
nucleus/libs/sql/sql.php
nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php
nucleus/locales/bg_Cyrl_BG.UTF-8.php
nucleus/locales/ca_Latn_ES.ISO-8859-1.php
nucleus/locales/ca_Latn_ES.UTF-8.php
nucleus/locales/cs_Latn_CZ.UTF-8.php
nucleus/locales/cs_Latn_CZ.WINDOWS-1250.php
nucleus/locales/de_Latn_DE.ISO-8859-1.php
nucleus/locales/de_Latn_DE.UTF-8.php
nucleus/locales/en_Latn_US.ISO-8859-1.php
nucleus/locales/en_Latn_US.UTF-8.php
nucleus/locales/es_Latn_ES.ISO-8859-1.php
nucleus/locales/es_Latn_ES.UTF-8.php
nucleus/locales/fa_Arab_IR.UTF-8.php
nucleus/locales/fi_Latn_FI.ISO-8859-1.php
nucleus/locales/fi_Latn_FI.UTF-8.php
nucleus/locales/fr_Latn_FR.ISO-8859-15.php
nucleus/locales/fr_Latn_FR.UTF-8.php
nucleus/locales/gl_Latn_ES.ISO-8859-1.php
nucleus/locales/gl_Latn_ES.UTF-8.php
nucleus/locales/hr_Latn_HR.UTF-8.php
nucleus/locales/hr_Latn_HR.WINDOWS-1250.php
nucleus/locales/hu_Latn_HU.ISO-8859-2.php
nucleus/locales/hu_Latn_HU.UTF-8.php
nucleus/locales/id_Latn_ID.ISO-8859-1.php
nucleus/locales/id_Latn_ID.UTF-8.php
nucleus/locales/it_Latn_IT.ISO-8859-1.php
nucleus/locales/it_Latn_IT.UTF-8.php
nucleus/locales/ja_Jpan_JP.EUC-JP.php
nucleus/locales/ja_Jpan_JP.UTF-8.php
nucleus/locales/ko_Kore_KR.EUC-KR.php
nucleus/locales/ko_Kore_KR.UTF-8.php
nucleus/locales/ku_Arab_TR.UTF-8.php
nucleus/locales/lv_Latn_LV.ISO-8859-13.php
nucleus/locales/lv_Latn_LV.UTF-8.php
nucleus/locales/nl_Latn_NL.ISO-8859-15.php
nucleus/locales/nl_Latn_NL.UTF-8.php
nucleus/locales/pl_Latn_PL.UTF-8.php
nucleus/locales/pt_Latn_BR.ISO-8859-1.php
nucleus/locales/pt_Latn_BR.UTF-8.php
nucleus/locales/ro_Latn_RO.ISO-8859-1.php
nucleus/locales/ro_Latn_RO.UTF-8.php
nucleus/locales/ru_Cyrl_RU.UTF-8.php
nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php
nucleus/locales/sk_Latn_SK.ISO-8859-2.php
nucleus/locales/sk_Latn_SK.UTF-8.php
nucleus/locales/sr_Cyrl_RS.UTF-8.php
nucleus/locales/ur_Arab_PK.UTF-8.php
nucleus/locales/vi_Latn_VN.UTF-8.php
nucleus/locales/zh_Hans_CN.GB2312.php
nucleus/locales/zh_Hans_CN.UTF-8.php
nucleus/locales/zh_Hant_TW.UTF-8.php
nucleus/media.php
nucleus/plugins/NP_SecurityEnforcer.php
nucleus/plugins/NP_SkinFiles.php
nucleus/upgrades/upgrade.functions.php
nucleus/upgrades/upgrade4.0.php
nucleus/xmlrpc/server.php
skins/admin/bookmarklet/styles/addedit.css
skins/default/nicetitle.js

author	sakamocchi <o-takashi@sakamocchi.jp>
	Mon, 17 Sep 2012 11:10:23 +0000 (20:10 +0900)
committer	sakamocchi <o-takashi@sakamocchi.jp>
	Mon, 17 Sep 2012 11:10:23 +0000 (20:10 +0900)
commit	c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c
tree	18d23d82f5a3eb253f71a51172af6649481c6a6e	tree \| snapshot
parent	fe4e862f6b23596d657c5228588785dfe537fb8f	commit \| diff
parent	6575e866f3fd1938601432841d80f82e9d259265	commit \| diff

.buildpath	\|	\|	blob
.project	\|	\|	blob
.settings/org.eclipse.core.resources.prefs	\|	\|	blob
.settings/org.eclipse.php.core.prefs	\|	\|	blob
action.php	diff1 \|	diff2 \|	blob \| history
index.php	diff1 \|	diff2 \|	blob \| history
install/index.php	diff1 \|	diff2 \|	blob \| history
nucleus/bookmarklet.php	diff1 \|	diff2 \|	blob \| history
nucleus/convert/functions.inc.php	diff1 \|	diff2 \|	blob \| history
nucleus/convert/wordpress.php	diff1 \|	diff2 \|	blob \| history
nucleus/index.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/ACTION.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/ACTIONLOG.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/ACTIONS.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/ADMIN.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/BAN.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/BLOG.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/BODYACTIONS.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/BaseActions.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/COMMENT.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/COMMENTACTIONS.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/COMMENTS.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/ITEM.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/ITEMACTIONS.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/KARMA.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/MANAGER.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/MEDIA.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/MEMBER.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/NOTIFICATION.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/PARSER.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/PLUGIN.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/PLUGINADMIN.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/SEARCH.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/SKIN.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/TEMPLATE.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/backup.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/globalfunctions.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/i18n.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/showlist.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/skinie.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/sql/DB.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/sql/MYSQLPDO.php	diff1 \|	diff2 \|	blob \| history
nucleus/libs/sql/sql.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/bg_Cyrl_BG.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ca_Latn_ES.ISO-8859-1.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ca_Latn_ES.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/cs_Latn_CZ.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/cs_Latn_CZ.WINDOWS-1250.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/de_Latn_DE.ISO-8859-1.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/de_Latn_DE.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/en_Latn_US.ISO-8859-1.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/en_Latn_US.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/es_Latn_ES.ISO-8859-1.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/es_Latn_ES.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/fa_Arab_IR.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/fi_Latn_FI.ISO-8859-1.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/fi_Latn_FI.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/fr_Latn_FR.ISO-8859-15.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/fr_Latn_FR.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/gl_Latn_ES.ISO-8859-1.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/gl_Latn_ES.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/hr_Latn_HR.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/hr_Latn_HR.WINDOWS-1250.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/hu_Latn_HU.ISO-8859-2.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/hu_Latn_HU.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/id_Latn_ID.ISO-8859-1.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/id_Latn_ID.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/it_Latn_IT.ISO-8859-1.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/it_Latn_IT.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ja_Jpan_JP.EUC-JP.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ja_Jpan_JP.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ko_Kore_KR.EUC-KR.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ko_Kore_KR.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ku_Arab_TR.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/lv_Latn_LV.ISO-8859-13.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/lv_Latn_LV.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/nl_Latn_NL.ISO-8859-15.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/nl_Latn_NL.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/pl_Latn_PL.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/pt_Latn_BR.ISO-8859-1.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/pt_Latn_BR.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ro_Latn_RO.ISO-8859-1.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ro_Latn_RO.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ru_Cyrl_RU.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/sk_Latn_SK.ISO-8859-2.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/sk_Latn_SK.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/sr_Cyrl_RS.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/ur_Arab_PK.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/vi_Latn_VN.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/zh_Hans_CN.GB2312.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/zh_Hans_CN.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/locales/zh_Hant_TW.UTF-8.php	diff1 \|	diff2 \|	blob \| history
nucleus/plugins/NP_SecurityEnforcer.php	diff1 \|	diff2 \|	blob \| history
nucleus/plugins/NP_SkinFiles.php	diff1 \|	diff2 \|	blob \| history
nucleus/upgrades/upgrade.functions.php	diff1 \|	diff2 \|	blob \| history
nucleus/upgrades/upgrade0.96.php	diff1 \|	diff2 \|	blob \| history
nucleus/upgrades/upgrade1.0.php	diff1 \|	diff2 \|	blob \| history
nucleus/upgrades/upgrade1.1.php	diff1 \|	diff2 \|	blob \| history
nucleus/upgrades/upgrade1.5.php	diff1 \|	diff2 \|	blob \| history
nucleus/upgrades/upgrade2.5.php	diff1 \|	diff2 \|	blob \| history
nucleus/upgrades/upgrade3.3.php	diff1 \|	diff2 \|	blob \| history
nucleus/upgrades/upgrade4.0.php	diff1 \|	diff2 \|	blob \| history
nucleus/xmlrpc/server.php	diff1 \|	diff2 \|	blob \| history
skins/admin/bookmarklet/javascripts/edit.js	diff1 \|	diff2 \|	blob \| history
skins/admin/bookmarklet/styles/addedit.css	\|	diff2 \|	blob \| history
skins/admin/default/styles/admin_original.css	diff1 \|	diff2 \|	blob \| history
skins/default/nicetitle.js	diff1 \|	diff2 \|	blob \| history