xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-life' into dev

Browse Source 
Conflicts:
	app/init.go
	app/service/UserService.go
	conf/app.conf
	conf/routes
	mongodb_backup/leanote_install_data/albums.metadata.json
	mongodb_backup/leanote_install_data/attachs.metadata.json
	mongodb_backup/leanote_install_data/blog_comments.metadata.json
	mongodb_backup/leanote_install_data/blog_likes.metadata.json
	mongodb_backup/leanote_install_data/blog_singles.metadata.json
	mongodb_backup/leanote_install_data/configs.bson
	mongodb_backup/leanote_install_data/configs.metadata.json
	mongodb_backup/leanote_install_data/email_logs.metadata.json
	mongodb_backup/leanote_install_data/files.metadata.json
	mongodb_backup/leanote_install_data/find_pwds.metadata.json
	mongodb_backup/leanote_install_data/group_users.metadata.json
	mongodb_backup/leanote_install_data/groups.metadata.json
	mongodb_backup/leanote_install_data/has_share_notes.metadata.json
	mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json

mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.jso
n

mongodb_backup/leanote_install_data/note_content_histories.metadata.json
	mongodb_backup/leanote_install_data/note_contents.metadata.json
	mongodb_backup/leanote_install_data/note_images.metadata.json
	mongodb_backup/leanote_install_data/notebooks.bson
	mongodb_backup/leanote_install_data/notebooks.metadata.json
	mongodb_backup/leanote_install_data/notes.bson
	mongodb_backup/leanote_install_data/notes.metadata.json
	mongodb_backup/leanote_install_data/reports.metadata.json
	mongodb_backup/leanote_install_data/sessions.metadata.json
	mongodb_backup/leanote_install_data/share_notebooks.metadata.json
	mongodb_backup/leanote_install_data/share_notes.metadata.json
	mongodb_backup/leanote_install_data/suggestions.metadata.json
	mongodb_backup/leanote_install_data/system.indexes.bson
	mongodb_backup/leanote_install_data/tag_count.metadata.json
	mongodb_backup/leanote_install_data/tags.metadata.json
	mongodb_backup/leanote_install_data/themes.metadata.json
	mongodb_backup/leanote_install_data/tokens.metadata.json
	mongodb_backup/leanote_install_data/user_blogs.metadata.json
	mongodb_backup/leanote_install_data/users.bson
	mongodb_backup/leanote_install_data/users.metadata.json
	public/blog/themes/default/theme.json
	public/blog/themes/elegant/theme.json
	public/blog/themes/nav_fixed/theme.json
	public/images/logo/leanote_icon_blue.jpg
	public/js/app/note-min.js
	public/js/app/note.js
	public/js/app/notebook-min.js
	public/js/app/notebook.js
	public/js/app/tag-min.js
	public/js/app/tag.js
	public/tinymce/plugins/paste/plugin.dev.js
	public/tinymce/plugins/spellchecker/plugin.min.js
	public/tinymce/tinymce.dev.js
	public/tinymce/tinymce.jquery.dev.js
This commit is contained in:
life
2015-03-31 16:18:22 +08:00
parent 3b1d9e6a73 9aacba4c31
commit 5fae5dd10e
510 changed files with 7769 additions and 2623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/admin/nav.html
View File

@ -229,7 +229,12 @@
<li>
<a href="/admin/t?t=upgrade/beta2">
<span>
v1.0-beta to v1.0-beta2
v1.0-beta to v1.0-beta.2
</span>
</a>
<a href="/admin/t?t=upgrade/beta3">
<span>
v1.0-beta.2/3 to v1.0-beta.4
</span>
</a>
</li>

22
app/views/admin/upgrade/beta2.html
View File

@ -1,5 +1,5 @@
{{template "admin/top.html" .}}
<div class="m-b-md"> <h3 class="m-b-none">Upgrade v1.0-beta to v1.0-beta2</h3></div>
<div class="m-b-md"> <h3 class="m-b-none">Upgrade v1.0-beta to v1.0-beta.2</h3></div>
<div class="row">
@ -17,7 +17,7 @@
</ul>
</div>
<footer class="panel-footer text-right bg-light lter">
<button type="submit" id="submit" class="btn btn-success btn-s-xs">Upgrade</button>
<button type="submit" id="submit" class="btn btn-success btn-s-xs">Upgrade to v1.0-beta.2</button>
</footer>
</section>
</form>
@ -31,14 +31,16 @@ $(function() {
$("#submit").click(function(e){
e.preventDefault();
var t = this;
$(t).button('loading');
ajaxPost("/adminUpgrade/UpgradeBetaToBeta2", {}, function(ret){
$(t).button('reset')
if(!ret.Ok) {
art.alert(ret.Msg)
} else {
art.tips("Success");
}
art.confirm("Are you sure to upgrade to v1.0-beta.2", function() {
$(t).button('loading');
ajaxPost("/adminUpgrade/UpgradeBetaToBeta2", {}, function(ret){
$(t).button('reset')
if(!ret.Ok) {
art.alert(ret.Msg)
} else {
art.tips("Success");
}
});
});
});
});

46
app/views/admin/upgrade/beta3.html Normal file
View File

@ -0,0 +1,46 @@
{{template "admin/top.html" .}}
<div class="m-b-md"> <h3 class="m-b-none">Upgrade v1.0-beta.2/3 to v1.0-beta.4</h3></div>
<div class="row">
<div class="col-sm-6">
<form id="add_user_form">
<section class="panel panel-default">
<div class="panel-body">
Current Version: <span class="label label-success">leanote v{{.version}}</span>
<ul>
<li>Api support (Enable Leanote Desktop App to connect server))</li>
<li>Update tags</li>
</ul>
</div>
<footer class="panel-footer text-right bg-light lter">
<button type="submit" id="submit" class="btn btn-success btn-s-xs">Upgrade to v1.0-beta.4</button>
</footer>
</section>
</form>
</div>
</div>
{{template "admin/footer.html" .}}
<script>
$(function() {
$("#submit").click(function(e) {
e.preventDefault();
var t = this;
art.confirm("Are you sure to upgrade to v1.0-beta.4 ? Please don't try to upgrade twice.", function() {
$(t).button('loading');
ajaxPost("/adminUpgrade/UpgradeBeta3ToBeta4", {}, function(ret){
$(t).button('reset')
if(!ret.Ok) {
art.alert(ret.Msg)
} else {
art.tips("Success");
}
});
});
});
});
</script>
{{template "admin/end.html" .}}

4
app/views/note/note-dev.html
View File

@ -713,7 +713,7 @@ function log(o) {
<!-- 插入图片 -->
<div class="modal fade modal-insert-image">
<div class="modal-dialog" style="width: 840px">
<div class="modal-dialog" style="width: 840px;max-width:100%;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"
@ -928,4 +928,4 @@ window.require = {
<script src="/js/require.js"></script>
</script>
</body>
</html>
</html>