Merge branch 'dev-life' into dev

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

app

conf

app.conf routes

mongodb_backup/leanote_install_data

public

blog

themes

default

elegant

nav_fixed

css

dist

themes

default.css

app

note-min.js notebook-min.js notebook.js page-min.js page.js tag-min.js tag.js

common-min.js common.js

google-code-prettify

prettify.css

libs

ace

ace-modify.txt ace.js

ext-beautify-min.js ext-chromevox-min.js ext-elastic_tabstops_lite-min.js ext-emmet-min.js ext-error_marker-min.js ext-keybinding_menu-min.js ext-language_tools-min.js ext-linking-min.js ext-modelist-min.js ext-old_ie-min.js ext-settings_menu-min.js ext-spellcheck-min.js ext-split-min.js ext-static_highlight-min.js ext-statusbar-min.js ext-textarea-min.js ext-themelist-min.js ext-whitespace-min.js keybinding-emacs-min.js mode-abap-min.js mode-actionscript-min.js mode-ada-min.js mode-apache_conf-min.js mode-asciidoc-min.js mode-assembly_x86-min.js mode-autohotkey-min.js mode-batchfile-min.js mode-c9search-min.js mode-cirru-min.js mode-clojure-min.js mode-cobol-min.js mode-coffee-min.js mode-coldfusion-min.js mode-csharp-min.js mode-css-min.js mode-d-min.js mode-dart-min.js mode-diff-min.js mode-django-min.js mode-dot-min.js mode-eiffel-min.js mode-ejs-min.js mode-erlang-min.js mode-ftl-min.js mode-gcode-min.js mode-gherkin-min.js mode-gitignore-min.js mode-glsl-min.js mode-golang-min.js mode-groovy-min.js mode-haml-min.js mode-handlebars-min.js

ext-beautify.js ext-chromevox.js ext-elastic_tabstops_lite.js ext-emmet.js ext-error_marker.js ext-keybinding_menu.js ext-language_tools.js ext-linking.js ext-modelist.js ext-old_ie.js ext-searchbox.js ext-settings_menu.js ext-spellcheck.js ext-split.js ext-static_highlight.js ext-statusbar.js ext-textarea.js ext-themelist.js ext-whitespace.js keybinding-emacs.js keybinding-vim.js mode-abap.js mode-abc.js mode-actionscript.js mode-ada.js mode-apache_conf.js mode-applescript.js mode-asciidoc.js mode-assembly_x86.js mode-autohotkey.js mode-batchfile.js mode-c9search.js mode-c_cpp.js mode-cirru.js mode-clojure.js mode-cobol.js mode-coffee.js mode-coldfusion.js mode-csharp.js mode-css.js mode-curly.js mode-d.js mode-dart.js mode-diff.js mode-django.js mode-dockerfile.js mode-dot.js mode-eiffel.js mode-ejs.js mode-elixir.js mode-elm.js mode-erlang.js mode-forth.js mode-ftl.js mode-gcode.js mode-gherkin.js mode-gitignore.js mode-glsl.js mode-golang.js mode-groovy.js mode-haml.js mode-handlebars.js mode-haskell.js mode-haxe.js mode-html.js mode-html_ruby.js mode-ini.js mode-io.js mode-jack.js mode-jade.js mode-java.js mode-javascript.js mode-json.js mode-jsoniq.js mode-jsp.js mode-jsx.js mode-julia.js mode-latex.js mode-lean.js mode-less.js mode-liquid.js mode-lisp.js mode-livescript.js mode-logiql.js mode-lsl.js mode-lua.js mode-luapage.js mode-lucene.js mode-makefile.js mode-markdown.js mode-mask.js mode-matlab.js mode-mel.js mode-mushcode.js mode-mysql.js mode-nix.js mode-objectivec.js mode-ocaml.js mode-pascal.js mode-perl.js mode-pgsql.js mode-php.js mode-plain_text.js mode-powershell.js mode-praat.js mode-prolog.js mode-properties.js mode-protobuf.js mode-python.js mode-r.js mode-rhtml.js mode-ruby.js mode-rust.js mode-scad.js mode-scala.js mode-scheme.js mode-scss.js mode-sh.js mode-sjs.js mode-smarty.js mode-snippets.js mode-soy_template.js mode-sql.js mode-stylus.js mode-svg.js mode-tcl.js mode-tex.js mode-text.js mode-textile.js mode-toml.js mode-twig.js mode-typescript.js mode-vala.js mode-vbscript.js mode-velocity.js mode-verilog.js mode-vhdl.js mode-xml.js mode-xquery.js mode-yaml.js

snippets

abap.js abc.js actionscript.js ada.js apache_conf.js applescript.js asciidoc.js assembly_x86.js autohotkey.js batchfile.js c9search.js c_cpp.js cirru.js clojure.js cobol.js coffee.js coldfusion.js csharp.js css.js curly.js d.js dart.js diff.js django.js dockerfile.js dot.js eiffel.js ejs.js elixir.js elm.js erlang.js forth.js ftl.js gcode.js gherkin.js gitignore.js glsl.js golang.js groovy.js haml.js handlebars.js haskell.js haxe.js html.js html_ruby.js ini.js io.js jack.js jade.js java.js javascript.js json.js jsoniq.js jsp.js jsx.js julia.js latex.js lean.js less.js liquid.js lisp.js livescript.js logiql.js lsl.js lua.js luapage.js lucene.js makefile.js markdown.js mask.js matlab.js mel.js mushcode.js mysql.js nix.js objectivec.js ocaml.js pascal.js perl.js pgsql.js php.js plain_text.js powershell.js praat.js prolog.js properties.js protobuf.js python.js r.js rdoc.js rhtml.js ruby.js rust.js sass.js scad.js scala.js scheme.js scss.js sh.js sjs.js smarty.js snippets.js soy_template.js space.js sql.js stylus.js svg.js tcl.js tex.js text.js textile.js toml.js twig.js typescript.js vala.js vbscript.js velocity.js verilog.js vhdl.js xml.js xquery.js yaml.js

theme-ambiance.js theme-chaos.js theme-chrome.js theme-clouds.js theme-clouds_midnight.js theme-cobalt.js theme-crimson_editor.js theme-dawn.js theme-dreamweaver.js theme-eclipse.js theme-github.js theme-idle_fingers.js theme-katzenmilch.js theme-kr_theme.js theme-kuroir.js theme-merbivore.js theme-merbivore_soft.js theme-mono_industrial.js theme-monokai.js theme-pastel_on_dark.js theme-solarized_dark.js theme-solarized_light.js theme-terminal.js theme-textmate.js theme-tomorrow.js theme-tomorrow_night.js theme-tomorrow_night_blue.js theme-tomorrow_night_bright.js theme-tomorrow_night_eighties.js theme-twilight.js theme-vibrant_ink.js theme-xcode.js worker-coffee.js worker-css.js worker-html.js worker-javascript.js worker-json.js worker-lua.js worker-php.js worker-xml.js worker-xquery.js

tinymce

plugins

leaui_image

public

for_editor.js

paste

plugin.dev.js

spellchecker

plugin.dev.js plugin.min.js

table

plugin.dev.js plugin.js plugin.min.js

tinymce.dev.js tinymce.full.min.js tinymce.jquery.dev.js tinymce_update_log

									
										6

mongodb_backup/leanote_install_data/blog_likes.metadata.json
									
				@ -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

Merge branch 'dev-life' into dev

6 mongodb_backup/leanote_install_data/blog_likes.metadata.json

6

mongodb_backup/leanote_install_data/blog_likes.metadata.json