Merge pull request #14007 from edx/release

Release Nov 16th, 2016

lms/djangoapps/discussion/static/discussion/js/discussion_router.js

@@ -6,10 +6,9 @@
             'underscore',
             'backbone',
             'common/js/discussion/utils',
-            'common/js/discussion/models/discussion_course_settings',
             'common/js/discussion/views/discussion_thread_view'
         ],
-        function(_, Backbone, DiscussionUtil, DiscussionCourseSettings, DiscussionThreadView) {
+        function(_, Backbone, DiscussionUtil, DiscussionThreadView) {
             var DiscussionRouter = Backbone.Router.extend({
                 routes: {
                     '': 'allThreads',
@@ -21,7 +20,7 @@
                     _.bindAll(this, 'allThreads', 'showThread');
                     this.courseId = options.courseId;
                     this.discussion = options.discussion;
-                    this.course_settings = new DiscussionCourseSettings(options.course_settings);
+                    this.course_settings = options.courseSettings;
                     this.discussionBoardView = options.discussionBoardView;
                     this.newPostView = options.newPostView;
                 },

lms/envs/common.py

@@ -1572,6 +1572,7 @@ PIPELINE_JS = {
                 'js/sticky_filter.js',
                 'js/query-params.js',
                 'common/js/vendor/moment-with-locales.js',
+                'common/js/vendor/moment-timezone-with-data.js',
             ]
         ),
         'output_filename': 'js/lms-application.js',
@@ -1720,8 +1721,10 @@ REQUIRE_JS_PATH_OVERRIDES = {
     'js/bookmarks/views/bookmark_button': 'js/bookmarks/views/bookmark_button.js',
     'js/views/message_banner': 'js/views/message_banner.js',
     'moment': 'common/js/vendor/moment-with-locales.js',
+    'moment-timezone': 'common/js/vendor/moment-timezone-with-data.js',
     'js/courseware/course_home_events': 'js/courseware/course_home_events.js',
     'js/courseware/accordion_events': 'js/courseware/accordion_events.js',
+    'js/dateutil_factory': 'js/dateutil_factory.js',
     'js/courseware/link_clicked_events': 'js/courseware/link_clicked_events.js',
     'js/courseware/toggle_element_visibility': 'js/courseware/toggle_element_visibility.js',
     'js/student_account/logistration_factory': 'js/student_account/logistration_factory.js',

lms/static/js/dateutil_factory.js

@@ -93,4 +93,3 @@
         return DateUtilFactory;
     });
 }).call(this, define || RequireJS.define);
-

lms/static/js/student_account/views/account_settings_factory.js

@@ -115,12 +115,7 @@
                                 required: true,
                                 title: gettext('Time Zone'),
                                 valueAttribute: 'time_zone',
-                                helpMessage: gettext(
-                                    'Select the time zone for displaying course dates. ' +
-                                    'If you do not specify a time zone, course dates, ' +
-                                    'including assignment deadlines, will be displayed ' +
-                                    'in your browser\'s local time zone.'
-                                ),
+                                helpMessage: gettext('Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser\'s local time zone.'), // eslint-disable-line max-len
                                 groupOptions: [{
                                     groupTitle: gettext('All Time Zones'),
                                     selectOptions: fieldsData.time_zone.options

lms/static/lms/js/build.js

@@ -40,7 +40,8 @@
             'lms/js/preview/preview_factory',
             'support/js/certificates_factory',
             'support/js/enrollment_factory',
-            'teams/js/teams_tab_factory'
+            'teams/js/teams_tab_factory',
+            'js/dateutil_factory'
         ]),
 
         /**