Commit 73b06508 authored by Vanessa's avatar Vanessa

Merge branch '0.5.6' of https://github.com/b3log/b3log-solo into 0.5.6

Conflicts:
	war/src/main/webapp/admin-plugin-list.ftl

	modified:   war/src/main/webapp/js/admin/plugin.js
	modified:   war/src/main/webapp/js/admin/pluginList.js
parents 10149227 b803a476
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo parent POM.
Version: 2.0.2.7, Jan 15, 2013
Version: 2.0.2.8, Jan 24, 2013
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -38,7 +38,7 @@
<freemarker-gae.version>2.3.19</freemarker-gae.version>
<jsoup.version>1.5.2</jsoup.version>
<markdownpapers-core.version>1.2.7</markdownpapers-core.version>
<markdownpapers-core.version>1.3.2</markdownpapers-core.version>
<!-- <com.google.api.client.version>1.2.1-alpha</com.google.api.client.version>-->
<!-- maven plugin -->
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
......
......@@ -131,4 +131,4 @@ admin.plugin = {
break;
}
}
};
\ No newline at end of file
};
......@@ -107,14 +107,13 @@ admin.pluginList = {
}
});
},
toSetting:function(pluginId){
$("#loadMsg").text(Label.loadingLabel);
var requestJSONObject = {
"oId": pluginId
},
that = this;
};
$.ajax({
url: latkeConfig.servePath + "/console/plugin/toSetting",
......@@ -132,6 +131,7 @@ admin.pluginList = {
});
},
changeStatus: function (pluginId, status) {
if (status === "ENABLED") {
status = "DISABLED";
......@@ -174,4 +174,4 @@ admin.register["plugin-list"] = {
"refresh": function () {
$("#loadMsg").text("");
}
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment