Update to release-2015-11-09

.gitignore

@@ -76,13 +76,15 @@ lms/static/certificates/css/
 cms/static/css/
 
 ### Styling generated from templates
-lms/static/sass/lms-main.scss
-lms/static/sass/lms-main-rtl.scss
-lms/static/sass/lms-course.scss
-lms/static/sass/lms-course-rtl.scss
-lms/static/sass/lms-footer.scss
-lms/static/sass/lms-footer-rtl.scss
-
+lms/static/sass/*.css
+lms/static/sass/*.css.map
+lms/static/certificates/sass/*.css
+lms/static/themed_sass/
+cms/static/css/
+cms/static/sass/*.css
+cms/static/sass/*.css.map
+cms/static/themed_sass/
+themes/**/css/*.css
 
 ### Logging artifacts
 log/

.jshintrc

@@ -109,13 +109,18 @@
     // The parameter "predef" should remain empty for this configuration file
     // to remain as general as possible.
     "predef": [
-        // jQuery library.
+        // jQuery globals
         "jQuery", "$",
 
-        // Underscore.js library.
+        // Underscore.js globals
         "_",
 
-        // Jasmine library.
+        // RequireJS globals
+        "define",
+        "require",
+        "RequireJS",
+
+        // Jasmine globals
         "jasmine",
         "describe", "xdescribe",
         "it", "xit",
@@ -126,12 +131,15 @@
         "waitsFor",
         "runs",
 
-        // jQuery-Jasmine library.
+        // jQuery-Jasmine globals
         "loadFixtures",
         "appendLoadFixtures",
         "readFixtures",
         "setFixtures",
         "appendSetFixtures",
-        "spyOnEvent"
+        "spyOnEvent",
+
+        // Miscellaneous globals
+        "JSON"
     ]
 }

AUTHORS

@@ -159,6 +159,7 @@ Tim Babych <[email protected]>
 Brandon DeRosier <[email protected]>
 Daniel Li <[email protected]>
 Daniel Friedman <[email protected]>
+Zia Fazal <[email protected]>
 Asad Iqbal <[email protected]>
 Peter Pinch <[email protected]>
 Muhammad Shoaib <[email protected]>
@@ -225,4 +226,31 @@ Alessandro Verdura <[email protected]>
 Sven Marnach <[email protected]>
 Richard Moch <[email protected]>
 Albert Liang <[email protected]>
-
+Pan Luo <[email protected]>
+Tyler Nickerson <[email protected]>
+Vedran Karačić <[email protected]>
+William Ono <[email protected]>
+Dongwook Yoon <[email protected]>
+Awais Qureshi <[email protected]>
+Eric Fischer <[email protected]>
+Brian Beggs <[email protected]>
+Bill DeRusha <[email protected]>
+Kevin Falcone <[email protected]>
+Mirjam Škarica <[email protected]>
+Saleem Latif <[email protected]>
+Julien Paillé <[email protected]>
+Michael Frey <[email protected]>
+Hasnain Naveed <[email protected]>
+J. Cliff Dyer <[email protected]>
+Jamie Folsom <[email protected]>
+George Schneeloch <[email protected]>
+Dustin Gadal <[email protected]>
+Ibrahim Ahmed <[email protected]>
+Robert Raposa <[email protected]>
+Giovanni Di Milia <[email protected]>
+Peter Wilkins <[email protected]>
+Justin Abrahms <[email protected]>
+Arbab Nazar <[email protected]>
+Douglas Hall <[email protected]>
+Awais Jibran <[email protected]>
+Muhammad Rehan <[email protected]>