Merge remote-tracking branch 'remotes/origin/newfunc_0510_forum_management' into SANDBOX

Conflicts: app/service/forumThreadService.js

Merge remote-tracking branch 'remotes/origin/newfunc_0510_forum_management' into SANDBOX
Conflicts: app/service/forumThreadService.js
2513893c · 刘文胜 · ef57f8dd · 7c887285 · 2513893c · 2513893c
Commit 2513893c authored May 31, 2016 by 刘文胜
Expand all Show whitespace changes
Inline Side-by-side

Showing with 511 additions and 4 deletions

forumThreadManagement.js app/controllers/admin/forumThreadManagement.js +510 -3

package.json package.json +1 -1

No files found.
--- a/app/controllers/admin/forumThreadManagement.js
+++ b/app/controllers/admin/forumThreadManagement.js
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
    "glob": "~4.3.1",
    "gridfs-stream": "^1.1.0",
    "hiredis": "^0.4.0",
-    "lodash": "~2.4.1",
+    "lodash": "~3.10.1",
    "method-override": "~2.3.0",
    "moment": "^2.10.6",
    "mongoose": "^4.1.0",