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

6
mongodb_backup/leanote_install_data/albums.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.albums", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.albums", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.albums" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/attachs.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.attachs", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.attachs", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.attachs" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/blog_comments.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_comments", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_comments", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.blog_comments" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/blog_likes.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_likes", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_likes", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.blog_likes" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/blog_singles.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_singles", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_singles", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.blog_singles" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/configs.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.configs", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.configs", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.configs" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/email_logs.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.email_logs", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.email_logs", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.email_logs" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/files.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.files", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.files", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.files" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/find_pwds.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.find_pwds", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.find_pwds", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.find_pwds" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/group_users.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.group_users", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.group_users", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.group_users" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/groups.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.groups", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.groups", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.groups" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.leanote.ShareNotes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "unique" : true, "ns" : "leanote_beta2.leanote.ShareNotes", "name" : "UserId_1_ToUserId_1_NoteId_1" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.leanote.ShareNotes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "unique" : true, "ns" : "leanote_beta2.leanote.ShareNotes", "name" : "UserId_1_ToUserId_1_NoteId_1" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.leanote.ShareNotes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "name" : "UserId_1_ToUserId_1_NoteId_1", "ns" : "leanote6.leanote.ShareNotes" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.leanote.has_share_notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1 }, "unique" : true, "ns" : "leanote_beta2.leanote.has_share_notes", "name" : "UserId_1_ToUserId_1" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.leanote.has_share_notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1 }, "unique" : true, "ns" : "leanote_beta2.leanote.has_share_notes", "name" : "UserId_1_ToUserId_1" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.leanote.has_share_notes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1 }, "name" : "UserId_1_ToUserId_1", "ns" : "leanote6.leanote.has_share_notes" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/note_content_histories.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_content_histories", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_content_histories", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.note_content_histories" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/note_contents.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_contents", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_contents", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.note_contents" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/note_images.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_images", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_images", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.note_images" } ] }
>>>>>>> dev-life

BIN
mongodb_backup/leanote_install_data/note_tags.bson Normal file
View File

Binary file not shown.

1
mongodb_backup/leanote_install_data/note_tags.metadata.json Normal file
View File

@ -0,0 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.note_tags" } ] }

6
mongodb_backup/leanote_install_data/notebooks.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.notebooks", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.notebooks", "name" : "UserId_1" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.notebooks", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.notebooks", "name" : "UserId_1" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.notebooks" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote6.notebooks" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/notes.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.notes", "name" : "UserId_1" }, { "v" : 1, "key" : { "IsTrash" : 1 }, "name" : "IsTrash_1", "ns" : "leanote_beta2.notes", "backgroud" : true }, { "v" : 1, "key" : { "UrlTitle" : 1 }, "name" : "UrlTitle_1", "ns" : "leanote_beta2.notes", "backgroud" : true }, { "v" : 1, "key" : { "IsBlog" : 1 }, "name" : "IsBlog_1", "ns" : "leanote_beta2.notes", "backgroud" : true }, { "v" : 1, "key" : { "CreatedTime" : 1 }, "name" : "CreatedTime_1", "ns" : "leanote_beta2.notes", "backgroud" : true }, { "v" : 1, "key" : { "UpdatedTime" : 1 }, "name" : "UpdatedTime_1", "ns" : "leanote_beta2.notes", "backgroud" : true }, { "v" : 1, "key" : { "PublicTime" : 1 }, "name" : "PublicTime_1", "ns" : "leanote_beta2.notes", "backgroud" : true } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.notes", "name" : "UserId_1" }, { "v" : 1, "key" : { "IsTrash" : 1 }, "name" : "IsTrash_1", "ns" : "leanote_beta2.notes", "backgroud" : true }, { "v" : 1, "key" : { "UrlTitle" : 1 }, "name" : "UrlTitle_1", "ns" : "leanote_beta2.notes", "backgroud" : true }, { "v" : 1, "key" : { "IsBlog" : 1 }, "name" : "IsBlog_1", "ns" : "leanote_beta2.notes", "backgroud" : true }, { "v" : 1, "key" : { "CreatedTime" : 1 }, "name" : "CreatedTime_1", "ns" : "leanote_beta2.notes", "backgroud" : true }, { "v" : 1, "key" : { "UpdatedTime" : 1 }, "name" : "UpdatedTime_1", "ns" : "leanote_beta2.notes", "backgroud" : true }, { "v" : 1, "key" : { "PublicTime" : 1 }, "name" : "PublicTime_1", "ns" : "leanote_beta2.notes", "backgroud" : true } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.notes" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote6.notes" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/reports.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.reports", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.reports", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.reports" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/sessions.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.sessions", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.sessions", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.sessions" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/share_notebooks.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.share_notebooks", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.share_notebooks", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.share_notebooks" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/share_notes.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.share_notes", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.share_notes", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.share_notes" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/suggestions.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.suggestions", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.suggestions", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.suggestions" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/tag_count.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tag_count", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tag_count", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.tag_count" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/tags.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tags", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.tags", "name" : "UserId_1" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tags", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.tags", "name" : "UserId_1" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.tags" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote6.tags" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/themes.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.themes", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.themes", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.themes" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/tokens.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tokens", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tokens", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.tokens" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/user_blogs.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.user_blogs", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.user_blogs", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.user_blogs" } ] }
>>>>>>> dev-life

6
mongodb_backup/leanote_install_data/users.metadata.json
View File

@ -1 +1,5 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.users", "name" : "_id_" } ] }
<<<<<<< HEAD
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.users", "name" : "_id_" } ] }
=======
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote6.users" } ] }
>>>>>>> dev-life