From b5c15e87586bb0dbf6b83ae740161c5879546c44 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 5 Apr 2017 12:33:48 +0800
Subject: [PATCH] add moment & angular-moment support

---
 bower.json                        | 4 +++-
 config/assets/default.js          | 5 ++++-
 config/assets/production.js       | 5 ++++-
 modules/core/client/app/config.js | 5 +++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bower.json b/bower.json
index c442b98c..45b9cc9a 100644
--- a/bower.json
+++ b/bower.json
@@ -17,7 +17,9 @@
     "owasp-password-strength-test": "~1.3.0",
     "angular-translate": "^2.15.1",
     "bootstrap-filestyle": "^1.2.1",
-    "Ionicons": "ionicons#^2.0.1"
+    "Ionicons": "ionicons#^2.0.1",
+    "angular-moment": "^1.0.1",
+    "moment": "^2.18.1"
   },
   "overrides": {
     "bootstrap": {
diff --git a/config/assets/default.js b/config/assets/default.js
index 5045a13c..08a427f6 100644
--- a/config/assets/default.js
+++ b/config/assets/default.js
@@ -28,7 +28,10 @@ module.exports = {
         'public/lib/angular-ui-router/release/angular-ui-router.js',
         'public/lib/owasp-password-strength-test/owasp-password-strength-test.js',
         'public/lib/angular-translate/angular-translate.js',
-        'public/lib/bootstrap-filestyle/src/bootstrap-filestyle.js'
+        'public/lib/bootstrap-filestyle/src/bootstrap-filestyle.js',
+        //moment
+        'public/lib/moment/min/moment-with-locales.js',
+        'public/lib/angular-moment/angular-moment.js'
         // endbower
       ],
       tests: ['public/lib/angular-mocks/angular-mocks.js']
diff --git a/config/assets/production.js b/config/assets/production.js
index a9cc01aa..dd66d6e7 100644
--- a/config/assets/production.js
+++ b/config/assets/production.js
@@ -10,7 +10,7 @@ module.exports = {
         'public/lib/angular-ui-notification/dist/angular-ui-notification.min.css',
         'public/lib/bootstrap/dist/css/bootstrap.min.css',
         'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
-        'public/lib/Ionicons/css/ionicons.min.css',
+        'public/lib/Ionicons/css/ionicons.min.css'
         // endbower
       ],
       js: [
@@ -27,6 +27,9 @@ module.exports = {
         'public/lib/owasp-password-strength-test/owasp-password-strength-test.js',
         'public/lib/angular-translate/angular-translate.min.js',
         'public/lib/bootstrap-filestyle/src/bootstrap-filestyle.min.js',
+        //moment
+        'public/lib/moment/min/moment-with-locales.min.js',
+        'public/lib/angular-moment/angular-moment.min.js'
         // endbower
       ]
     },
diff --git a/modules/core/client/app/config.js b/modules/core/client/app/config.js
index 031c54c1..f9ed4c68 100644
--- a/modules/core/client/app/config.js
+++ b/modules/core/client/app/config.js
@@ -6,7 +6,8 @@
   var service = {
     applicationEnvironment: window.env,
     applicationModuleName: applicationModuleName,
-    applicationModuleVendorDependencies: ['ngResource', 'ngAnimate', 'ngMessages', 'ui.router', 'ui.bootstrap', 'ngFileUpload', 'ui-notification', 'pascalprecht.translate'],
+    applicationModuleVendorDependencies: ['ngResource', 'ngAnimate', 'ngMessages', 'ui.router', 'ui.bootstrap', 'ngFileUpload', 'ui-notification',
+      'pascalprecht.translate', 'angularMoment'],
     registerModule: registerModule
   };
 
@@ -22,7 +23,7 @@
   }
 
   // Angular-ui-notification configuration
-  angular.module('ui-notification').config(function(NotificationProvider) {
+  angular.module('ui-notification').config(function (NotificationProvider) {
     NotificationProvider.setOptions({
       delay: 5000,
       startTop: 20,