v1.0-beta.4 mac

lealife · Apr 6, 2015 · e0ca859 · e0ca859
1 parent d29a879
commit e0ca859
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 2,332 deletions.
diff --git a/README.md b/README.md
@@ -5,10 +5,11 @@
 与leanote源码最大的区别是该仓库/bin下有leanote-mac, leanote-linux, leanote-win64三个二进制文件. 
 
 ## 如何安装
-1.使用mongorestore还原mongodb_backup/leanote_install_data数据
-2.配置conf/app.conf：mongodb参数配置,需要外网访问或代理访问时,修改参数site.url
-3.运行bin目录下的对应脚本启动leanote.(run-hide.vbs可以在windows下隐藏控制台运行)
-详细安装部署,参考: [leanote二进制版详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E4%BA%8C%E8%BF%9B%E5%88%B6%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
+1. 使用mongorestore还原mongodb_backup/leanote_install_data数据;
+2. 配置conf/app.conf：mongodb参数配置, 需要外网访问或代理访问时, 修改参数site.url;
+3. 运行bin目录下的对应脚本启动leanote. (run-hide.vbs可以在windows下隐藏控制台运行)
+
+详细安装部署, 参考: [leanote二进制版详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E4%BA%8C%E8%BF%9B%E5%88%B6%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
 
 ## 如何更新
 
@@ -18,7 +19,7 @@
 
 1. 将该程序解压到另一目录
 2. 将之前的`/conf/app.conf`, `/files`, `/public/upload`, `/mongodb_backup`文件夹 拷贝到 新目录的相应位置
-3. 重新运行`/bin/run.sh`
+3. 重新运行`/bin/run.sh` 或 `run.bat`
 
 ## 注意事项
-* 请勿向该仓库提交代码, 当然欢迎提交与二进制版相关的issue, 打包好的二进制leanote.
+* 请勿向该仓库提交代码, 当然欢迎提交与二进制版相关的issue, 打包好的二进制leanote.
diff --git a/app/views/admin/top.html b/app/views/admin/top.html
@@ -46,7 +46,7 @@
 					</a>
 				</li>
 				<li class="hidden-xs">
-					<a href="/blog/admin" class="dk" target="_blank">
+					<a href="/blog" class="dk" target="_blank">
 						My Blog
 					</a>
 				</li>
@@ -120,4 +120,4 @@
 							</ul>
 							-->
 							<!-- 主要内容区 -->
-
+
diff --git a/bin/leanote-linux b/bin/leanote-linux
diff --git a/bin/leanote-mac b/bin/leanote-mac
diff --git a/conf/app.conf b/conf/app.conf
@@ -2,14 +2,14 @@
 # leanote config
 #------------------------
 
-http.port=80
+http.port=9000
 
-site.url=http://localhost # or http://x.com:8080, http://www.xx.com:9000
+site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
 
 # mongdb
 db.host=localhost
 db.port=27017
-db.dbname=leanote # required
+db.dbname=leanote6 # required
 #db.username= # if not exists, please leave it blank
 #db.password= # if not exists, please leave it blank
 # or you can set the mongdb url for more complex needs the format is:

diff --git a/conf/routes b/conf/routes
@@ -37,8 +37,6 @@ POST	/findPasswordUpdate							Auth.FindPasswordUpdate
 * /note/copyNote Note.CopyNote
 * /note/copySharedNote Note.CopySharedNote
 * /note/searchNoteByTags Note.SearchNoteByTags
-* /note/toImage Note.ToImage
-* /note/html2Image Note.Html2Image
 * /note/setNote2Blog Note.SetNote2Blog
 # pjax
 GET     /note/:noteId   	                        Note.Index

diff --git a/public/blog/js/ck/common-min.js b/public/blog/js/ck/common-min.js
diff --git a/public/blog/themes/README.html b/public/blog/themes/README.html
diff --git a/public/css/css/editor-writting-mode.css b/public/css/css/editor-writting-mode.css
diff --git a/public/css/css/editor.css b/public/css/css/editor.css