Merge pull request #5034 from jamalex/pin_npm_versions

Pin npm versions

docs/faq.rst

@@ -236,3 +236,9 @@ Run the following command (beware it can take a while, the download size is over
 ``kalite manage unpack_assessment_zip https://learningequality.org/downloads/ka-lite/0.15/content/assessment.zip -f``
 
 As an alternative, you can download the zip file from https://learningequality.org/downloads/ka-lite/0.15/content/assessment.zip and run the command on your local copy. This is useful if you're deploying KA Lite on multiple computers.
+
+I can't get KA Lite to work on Windows! The installation succeeded, but nothing happens!
+----------------------------------------------------------------------------------------
+
+KA Lite on Windows is controlled through a task-tray program.
+See the :doc:`installation guide <installguide/install_all>` for some more info.

docs/installguide/install_all.rst

@@ -12,6 +12,22 @@ You don't need to uninstall your old KA Lite installation first.
 You can follow the prompts to either keep your existing data or delete old data and start over.
 See the :doc:`release notes <release_notes>` for critical upgrade information for specific versions.
 
+When you start the KA Lite program, you will find a leaf icon in your task tray.
+Right click on this icon to start/stop the server, open the application in a browser, or set other options:
+
+.. image:: windows_task_tray.png
+    :class: screenshot
+
+By default, you can access KA Lite on the installation computer from the address http://127.0.0.1:8008.
+To access KA Lite from other machines, you will need to connect to the same network as the installation computer and
+access port 8008 using the its IP address.
+For example, if the installation computer has the IP address 192.168.0.104 on your network then you can access it from
+other machines on the same network at the address http://192.168.0.104:8008.
+
+For more advanced use of KA Lite, such as changing the default port, see :ref:`running-ka-lite-with-your-own-settings`
+or use the command-line ``kalite`` program, which in typical installations can be found at the path
+``C:\Python27\Scripts\kalite``. Run ``kalite --help`` for usage info.
+
 Mac OS X
 ========
 

docs/installguide/release_notes.rst

@@ -1,6 +1,14 @@
 Release Notes
 =============
 
+0.16.0
+------
+
+General
+^^^^^^^
+
+* KA Lite is officially supported on OSX 10.11 (El Capitan).
+
 0.15.0
 ------
 
@@ -10,7 +18,7 @@ General
 Python 2.6 is no longer supported. It *may* still work, but we are no longer actively supporting it.
 Other known issues:
 
-* The latest OSX version (EL Capitan) is not yet supported.
+* The latest OSX version (EL Capitan) is not yet supported. KA Lite is officially supported on OS X 10.8 - 10.10.
 * On OSX, you must restart the server after downloading videos in order for them to be marked as available.
 * On all platforms, you must restart the server after downloading a language pack in order to use it.
 * You can no longer configure your server using ``local_settings.py``. Instead, custom settings must appear in

docs/usermanual/userman_admin.rst

@@ -614,6 +614,9 @@ Once you have deployed KA Lite to a computer, there are a number of ways you can
 
 .. warning:: Please follow these instructions carefully! Customizing the server incorrectly can break your installation. It can be very hard to find and undo the error.
 
+
+.. _running-ka-lite-with-your-own-settings:
+
 Running KA Lite with your own settings
 ______________________________________
 

kalite/distributed/features/steps/superuser_create.py

@@ -85,12 +85,6 @@ def step_impl(context):
 
 @then("the modal will dismiss")
 def impl(context):
-    for id_ in (PASSWORD_CONFIRM_ID, PASSWORD_ID, USERNAME_ID):
-        try:
-            is_border_red(context, id_)
-            raise RedBorderException("The border should not be red for the element with id #{0}".format(id_))
-        except AssertionError:
-            pass  # The border should _not_ be red, so the above function _should_ raise an exception
     assert elem_is_invisible_with_wait(context, context.modal_element, wait_time=120), "modal not dismissed!"
 
 def fill_field(context, text, field_id):

package.json

@@ -30,61 +30,61 @@
     "sinon": "~1.12.2"
   },
   "dependencies": {
-    "JSON2": "^0.1.0",
-    "async": "^1.4.0",
-    "backbone": "~1.2.1",
-    "bootstrap": "^3.3.5",
-    "bootstrap-datepicker": "^1.4.0",
-    "bootstrap-multiselect": "^0.9.13-1",
-    "browserify": "~11.0.1",
-    "browsernizr": "^1.0.2",
-    "colors": "^1.1.2",
-    "d3": "^3.5.6",
-    "es5-shim": "^4.1.10",
-    "escodegen": "^1.6.1",
-    "esprima": "^2.4.1",
-    "estraverse": "^4.1.0",
-    "factor-bundle": "~2.5.0",
-    "fastclick": "^1.0.6",
-    "handlebars": "~1.3.0",
-    "hbsfy": "~2.2.1",
-    "hintify": "^0.1.0",
-    "html5shiv": "^3.7.3",
-    "ie8": "^0.2.6",
-    "intro.js": "^0.9.0",
-    "jed": "^1.1.0",
-    "jquery": "~2.1.4",
-    "jquery-plainoverlay": "^0.6.2",
-    "jquery-slimscroll": "^1.3.6",
-    "jquery-sparkline": "^2.3.0",
-    "jquery-ui": "^1.10.5",
-    "jquery-ui-touch-punch": "^0.2.3",
-    "jquery.fancytree": "^2.11.0",
-    "katex": "^0.5.0",
-    "minifyify": "^7.0.2",
+    "async": "1.4.2",
+    "backbone": "1.2.2",
+    "bootstrap": "3.3.5",
+    "bootstrap-datepicker": "1.4.1",
+    "bootstrap-multiselect": "0.9.13-1",
+    "browserify": "11.0.1",
+    "browsernizr": "1.0.2",
+    "colors": "1.1.2",
+    "d3": "3.5.6",
+    "es5-shim": "4.1.11",
+    "escodegen": "1.6.1",
+    "esprima": "2.6.0",
+    "estraverse": "4.1.0",
+    "factor-bundle": "2.5.0",
+    "fastclick": "1.0.6",
+    "handlebars": "1.3.0",
+    "hbsfy": "2.2.1",
+    "hintify": "0.1.0",
+    "html5shiv": "3.7.3",
+    "ie8": "0.2.9",
+    "intro.js": "0.9.0",
+    "jed": "1.1.0",
+    "jquery": "2.1.4",
+    "jquery-plainoverlay": "0.6.2",
+    "jquery-slimscroll": "1.3.6",
+    "jquery-sparkline": "2.3.0",
+    "jquery-ui": "1.10.5",
+    "jquery-ui-touch-punch": "0.2.3",
+    "jquery.fancytree": "2.11.0",
+    "JSON2": "0.1.0",
+    "katex": "0.5.1",
+    "minifyify": "7.0.5",
     "node-lessify": "0.0.10",
-    "qtip2": "^2.2.0",
+    "qtip2": "2.2.0",
     "react": "0.14.7",
-    "react-addons-clone-with-props": "^0.14.7",
+    "react-addons-clone-with-props": "0.14.7",
     "react-addons-create-fragment": "0.14.7",
-    "react-addons-css-transition-group": "^0.14.7",
-    "react-addons-linked-state-mixin": "^0.14.7",
-    "react-addons-pure-render-mixin": "^0.14.7",
-    "react-addons-shallow-compare": "^0.14.7",
-    "react-addons-transition-group": "^0.14.7",
-    "react-addons-update": "^0.14.7",
-    "react-dom": "^0.14.7",
-    "react-mount": "^0.1.3",
-    "react-tools": "^0.13.3",
-    "reactify": "^1.1.1",
-    "scriptjs": "^2.5.7",
-    "seedrandom": "^2.4.2",
-    "soundmanager2": "^2.97.20150601",
-    "sprintf-js": "^1.0.3",
-    "through": "^2.3.8",
-    "underscore": "~1.8.3",
-    "url": "^0.10.3",
-    "video.js": "^5.7.1",
-    "watchify": "^3.3.1"
+    "react-addons-css-transition-group": "0.14.7",
+    "react-addons-linked-state-mixin": "0.14.7",
+    "react-addons-pure-render-mixin": "0.14.7",
+    "react-addons-shallow-compare": "0.14.7",
+    "react-addons-transition-group": "0.14.7",
+    "react-addons-update": "0.14.7",
+    "react-dom": "0.14.7",
+    "react-mount": "0.1.3",
+    "react-tools": "0.13.3",
+    "reactify": "1.1.1",
+    "scriptjs": "2.5.7",
+    "seedrandom": "2.4.2",
+    "soundmanager2": "2.97.20150601-a",
+    "sprintf-js": "1.0.3",
+    "through": "2.3.8",
+    "underscore": "1.8.3",
+    "url": "0.10.3",
+    "video.js": "5.8.0",
+    "watchify": "3.4.0"
   }
 }