OSDN Git Service

MERGE: リビジョン1873〜1893。skinnable-masterのマージ
authorsakamocchi <o-takashi@sakamocchi.jp>
Sun, 17 Jun 2012 09:05:40 +0000 (18:05 +0900)
committersakamocchi <o-takashi@sakamocchi.jp>
Sun, 17 Jun 2012 09:05:40 +0000 (18:05 +0900)
commit0f2bcd518e8d035a5e25317d7900a9eb23d80e80
treedc5b8a6696cfd62c1296b6e497706729adaec80b
parentb767b4e8351829b6af6852b13d572e7cc28ca8d3
MERGE: リビジョン1873〜1893。skinnable-masterのマージ

skinnable-masterを上流にマージした。

加えて、コード規則に従い、改行記号はUnixライクなLFに統一した。
169 files changed:
action.php
atom.php
build/testcases/NP_ImageCreateThumbnail.php
build/testcases/NP_ImageLimitSize.php
createaccount.php
extra/skins/readme.txt
index.php
install/index.php
install/install.sql
install/locales/en_Latn_US.UTF-8.php
install/locales/ja_Jpan_JP.UTF-8.php
install/styles/inst.css
license.txt
nucleus/convert/blogger.php
nucleus/convert/bloggercaif.php
nucleus/convert/functions.inc.php
nucleus/convert/genericImport.php
nucleus/convert/greymatter.php
nucleus/convert/livejournal.php
nucleus/documentation/devdocs/plugins.html
nucleus/documentation/devdocs/sqltables.html
nucleus/documentation/help.html
nucleus/documentation/history.html
nucleus/documentation/index.html
nucleus/forgotpassword.php
nucleus/index.php
nucleus/libs/.htaccess
nucleus/libs/ACTION.php
nucleus/libs/ACTIONLOG.php
nucleus/libs/ACTIONS.php
nucleus/libs/ADMIN.php
nucleus/libs/AdminActions.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/ENTITY.php
nucleus/libs/ITEM.php
nucleus/libs/ITEMACTIONS.php
nucleus/libs/KARMA.php
nucleus/libs/LINK.php
nucleus/libs/MANAGER.php
nucleus/libs/MEDIA.php
nucleus/libs/MEMBER.php
nucleus/libs/NOTIFICATION.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/index.html
nucleus/libs/showlist.php
nucleus/libs/skinie.php
nucleus/libs/sql/DB.php
nucleus/libs/sql/MYSQLPDO.php
nucleus/libs/sql/sql.php
nucleus/libs/vars4.1.0.php
nucleus/libs/xmlrpc.inc.php
nucleus/libs/xmlrpcs.inc.php
nucleus/locales/adminskinTypes.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/el_Grek_GR.UTF-8.php
nucleus/locales/el_Grek_GR.WINDOWS-1253.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/plugins/NP_SecurityEnforcer.php
nucleus/plugins/NP_SkinFiles.php
nucleus/plugins/medium/MediumActions.php
nucleus/plugins/skinfiles/index.php
nucleus/upgrades/index.php
nucleus/upgrades/upgrade.functions.php
nucleus/upgrades/upgrade.php
nucleus/upgrades/upgrade0.95.php
nucleus/upgrades/upgrade0.96.php
nucleus/upgrades/upgrade1.0.php
nucleus/upgrades/upgrade1.1.php
nucleus/upgrades/upgrade1.5.php
nucleus/upgrades/upgrade2.0.php
nucleus/upgrades/upgrade2.5.php
nucleus/upgrades/upgrade3.0.php
nucleus/upgrades/upgrade3.1.php
nucleus/upgrades/upgrade3.2.php
nucleus/upgrades/upgrade3.3.php
nucleus/upgrades/upgrade3.4.php
nucleus/upgrades/upgrade3.5.php
nucleus/upgrades/upgrade3.6.php
nucleus/upgrades/upgrade4.0.php
nucleus/xmlrpc/api_blogger.inc.php
nucleus/xmlrpc/api_metaweblog.inc.php
nucleus/xmlrpc/api_mt.inc.php
nucleus/xmlrpc/api_nucleus.inc.php
nucleus/xmlrpc/server.php
readme.html
robots.txt
rsd.php
skins/admin/bookmarklet/skinbackup.xml
skins/admin/default/javascripts/admin.js
skins/admin/default/javascripts/bookmarklet.js
skins/admin/default/javascripts/compatibility.js
skins/admin/default/javascripts/edit.js
skins/admin/default/javascripts/numbercheck.js
skins/admin/default/javascripts/opennew.js
skins/admin/default/javascripts/templateEdit.js
skins/admin/default/javascripts/xmlhttprequest.js
skins/admin/default/skinbackup.xml
skins/admin/default/styles/addedit.css
skins/admin/default/styles/admin_contemporary.css
skins/admin/default/styles/admin_original.css
skins/admin/default/styles/bookmarklet.css
skins/admin/default/styles/manual.css
skins/admin/default/styles/popups.css
skins/default/footer.inc
skins/default/nicetitle.js
xml-rss2.php [changed mode: 0644->0755]