pelikanchik · vetrolamu · Aug 1, 2013 · Jul 22, 2013 · Jul 15, 2013 · Jul 15, 2013
diff --git a/.bundle/config b/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: bin
diff --git a/AUTHORS b/AUTHORS
@@ -81,3 +81,6 @@ Felix Sun <[email protected]>
 Adam Palay <[email protected]>
 Ian Hoover <[email protected]>
 Mukul Goyal <[email protected]>
+Robert Marks <[email protected]>
+Yarko Tymciurak <[email protected]>
+
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,10 +5,30 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+Studio: Send e-mails to new Studio users (on edge only) when their course creator
+status has changed. This will not be in use until the course creator table
+is enabled.
+
+LMS: Added user preferences (arbitrary user/key/value tuples, for which
+which user/key is unique) and a REST API for reading users and
+preferences. Access to the REST API is restricted by use of the
+X-Edx-Api-Key HTTP header (which must match settings.EDX_API_KEY; if
+the setting is not present, the API is disabled).
+
+LMS: Added endpoints for AJAX requests to enable/disable notifications
+(which are not yet implemented) and a one-click unsubscribe page.
+
+Studio: Allow instructors of a course to designate other staff as instructors;
+this allows instructors to hand off management of a course to someone else.
+
+Common: Add a manage.py that knows about edx-platform specific settings and projects
+
 Common: Added *experimental* support for jsinput type.
 
 Common: Added setting to specify Celery Broker vhost
 
+Common: Utilize new XBlock bulk save API in LMS and CMS.
+
 Studio: Add table for tracking course creator permissions (not yet used).
 Update rake django-admin[syncdb] and rake django-admin[migrate] so they
 run for both LMS and CMS.
@@ -21,6 +41,8 @@ Studio: Added support for uploading and managing PDF textbooks
 
 Common: Student information is now passed to the tracking log via POST instead of GET.
 
+Blades: Added functionality and tests for new capa input type: choicetextresponse.
+
 Common: Add tests for documentation generation to test suite
 
 Blades: User answer now preserved (and changeable) after clicking "show answer" in choice problems
@@ -43,7 +65,7 @@ history of background tasks for a given problem and student.
 Blades: Small UX fix on capa multiple-choice problems.  Make labels only
 as wide as the text to reduce accidental choice selections.
 
-Studio: 
+Studio:
 - use xblock field defaults to initialize all new instances' fields and
 only use templates as override samples.
 - create new instances via in memory create_xmodule and related methods rather

diff --git a/README.md b/README.md
@@ -12,30 +12,35 @@ installation process.
 
 1. Make sure you have plenty of available disk space, >5GB
 2. Install Git: http://git-scm.com/downloads
-3. Install VirtualBox: https://www.virtualbox.org/wiki/Download_Old_Builds_4_2
-   (you need version 4.2.12, as later/earlier versions might not work well with 
-   Vagrant)
+3. Install VirtualBox: https://www.virtualbox.org/wiki/Downloads
+   See http://docs.vagrantup.com/v2/providers/index.html for a list of supported
+   Providers.  You should use VirtualBox >= 4.2.12.
+   (Windows: later/earlier VirtualBox versions than 4.2.12 have been reported to not work well with
+   Vagrant.  If this is still a problem, you can
+   install 4.2.12 from http://download.virtualbox.org/virtualbox/4.2.12/).
 4. Install Vagrant: http://www.vagrantup.com/ (Vagrant 1.2.2 or later)
 5. Open a terminal
-6. Download the project: `git clone git://github.com/edx/edx-platform.git`
+6. Download the project: `git clone https://github.com/edx/edx-platform.git`
 7. Enter the project directory: `cd edx-platform/`
-8. (Windows only) Run the commands to 
+8. (Windows only) Run the commands to
    [deal with line endings and symlinks under Windows](https://github.com/edx/edx-platform/wiki/Simplified-install-with-vagrant#dealing-with-line-endings-and-symlinks-under-windows)
-9. Start: `vagrant up`
+9. Create the development environment and start it: `vagrant up`
 
-The last step might require your host machine's administrator password to setup NFS.
+The initial `vagrant up` will download a Linux image, then boot and ask for your
+host machine's administrator password to setup file sharing between your computer and the VM.
+Once file sharing is established, `edx-platform/scripts/create-dev-env.sh` will
+install dependencies and configure the VM.
+This will take a while; go grab a coffee.
 
-Afterwards, it will download an image, install all the dependencies and configure
-the VM. It will take a while, go grab a coffee.
+When complete, you should see a _"Success!"_ message.
+If not, refer to the
+[troubleshooting section](https://github.com/edx/edx-platform/wiki/Simplified-install-with-vagrant#troubleshooting).
 
-Once completed, hopefully you should see a "Success!" message indicating that the
-installation went fine. (If not, refer to the 
-[troubleshooting section](https://github.com/edx/edx-platform/wiki/Simplified-install-with-vagrant#troubleshooting).)
+Your development environment is initialized only on the first bring-up.
+Subsequently `vagrant up` commands will boot your virtual machine normally.
 
-Note: by default, the VM will get the IP `192.168.20.40`. If you need to use a 
-different IP, you can edit the file `Vagrantfile`. If you have already started the 
-VM with `vagrant up`, see "Stopping and restarting the VM" below to take the change 
-into account.
+Note: by default, the VM will get the IP `192.168.20.40`.
+You can change this in your `Vagrantfile` (the startup message will reflect your VM's actual IP).
 
 Accessing the VM
 ----------------
@@ -46,62 +51,110 @@ Once the installation is finished, to log into the virtual machine:
 $ vagrant ssh
 ```
 
-Note: This won't work from Windows, install install PuTTY from
-http://www.chiark.greenend.org.uk/%7Esgtatham/putty/download.html instead. Then
-connect to 127.0.0.1, port 2222, using vagrant/vagrant as a user/password.
+Note: This won't work from Windows. Instead, install PuTTY from
+http://www.chiark.greenend.org.uk/%7Esgtatham/putty/download.html. Then
+connect to 192.168.20.40, port 2222, using vagrant/vagrant as a user/password.
+
 
 Using edX
 ---------
 
-Once inside the VM, you can start Studio and LMS with the following commands
-(from the `/opt/edx/edx-platform` folder):
+When you login to your VM, you are in
+`/opt/edx/edx-platform` by default, which is shared from your host workspace.
+Your host computer contains the edx-project development code and repository.
+Your VM runs edx-platform code mounted from your host, so
+you can develop by editing on your host.
+
+After logging into your VM with `vagrant ssh`,
+start the _Studio_ and
+_Learning management system (LMS)_
+servers (run these from `/opt/edx/edx-platform`):
 
 Learning management system (LMS):
 
 ```
 $ rake lms[cms.dev,0.0.0.0:8000]
 ```
 
-Studio:
+Studio (CMS):
 
 ```
 $ rake cms[dev,0.0.0.0:8001]
 ```
 
-Once started, open the following URLs in your browser:
+The servers will come up to these URLs:
 
-* Learning management system (LMS): http://192.168.20.40:8000/
-* Studio (CMS): http://192.168.20.40:8001/
+- LMS: http://192.168.20.40:8000/
+- CMS: http://192.168.20.40:8001/
 
-You can develop by editing the files directly in the `edx-platform/` directory you
-downloaded before, you don't need to connect to the VM to edit them (the VM uses
-those files to run edX, mirroring the folder in `/opt/edx/edx-platform`).
+Your VM's port 8000 is forwarded to host port 9000
+so you can also access the LMS with [http://localhost:9000/]().
+Similarly, VM port 8001 is forwarded to host port 9001.
+These are set in your `Vagrantfile`.
 
-You may also want to create a super-user with:
-
-```
-$ rake django-admin["createsuperuser"]
-```
-
-Also note that if you register a new user through the web interface,
-the activiation email will be posted to your VM's terminal window (search for
-lines similar to):
+Note that when you register a new user through the web interface,
+by default the activiation email will be appear on your VM's terminal.
+Search for lines similar to:
 
 ```
 Subject: Your account for edX Studio
 From: [email protected]
 ```
 
-and find the activation URL for the account you've created.
+and find the activation URL.
 
 See the [Frequently Asked Questions](https://github.com/edx/edx-platform/wiki/Frequently-Asked-Questions)
 for more usage tips.
 
+Django admin & debug toolbar
+-----------------------------
+
+You can enable admin logins and the debug_toolbar by editing
+`lms/envs/common.py`:
+
+- enable ADMIN login page by setting:
+  - ```
+     'ENABLE_DJANGO_ADMIN_SITE': True
+```
+
+
+- enable debug toolbar by uncommenting:
+  - ```
+    # 'debug_toolbar.middleware.DebugToolbarMiddleware',
+```
+
+These are also defined in `lms/envs/dev.py`,
+and usually active on localhost.
+
+To get at your VM's 127.0.0.1, explicitly forward one of VM's available localhost ports to your computer.
+Instead of `vagrant ssh`, login with:
+
+```
+$ ssh -L 6080:127.0.0.1:8080 [email protected]
+```
+
+The password is _vagrant_.
+
+From your VM, start the LMS as a localhost instance:
+
+```
+$ rake lms[cms.dev,127.0.0.1:8080]
+```
+
+You should see the debug toolbar now on [http:/localhost:6080/]().
+You should now also see a login on [http://localhost:6080/admin/]()
+You will need a privileged user for the admin login.
+You can create a CMS/LMS super-user with:
+```
+$ ./manage.py lms createsuperuser
+```
+
+
 Stopping & starting
 -------------------
 
-To stop the VM (from your `edx-platform/` directory):
 
+To stop the VM (from your `edx-platform/` directory):
 ```
 $ vagrant halt
 ```
@@ -112,16 +165,27 @@ To restart:
 $ vagrant up
 ```
 
-or, to start without attempting to update the dependencies:
+To suspend and resume tasks in progress on your VM:
+```
+$ vagrant suspend
+$ # and later...
+$ vagrant resume
+```
 
+Your development environment is normally created once, on first `vagrant up`.
+You can continue to fetch changes in edx-platform
+as you work with your VM.
+To re-create your VM and create a fresh development environment:
 ```
-$ vagrant up --no-provision
+$ vagrant destroy
+$ vagrant up  # will make a new VM
 ```
 
+
 Troubleshooting
 ---------------
 
-If anything doesn't work as expected, see the 
+If anything doesn't work as expected, see the
 [troubleshooting section](https://github.com/edx/edx-platform/wiki/Simplified-install-with-vagrant#troubleshooting).
 
 Installation - Advanced
@@ -229,30 +293,23 @@ or any other process management tool.
 
 Configuring Your Project
 ------------------------
-We use [`rake`](http://rake.rubyforge.org/) to execute common tasks in our
-project. The `rake` tasks are defined in the `rakefile`, or you can run `rake -T`
-to view a summary.
-
 Before you run your project, you need to create a sqlite database, create
-tables in that database, run database migrations, and populate templates for
-CMS templates. Fortunately, `rake` will do all of this for you! Just run:
+tables in that database, and run database migrations. Fortunately, `django`
+will do all of this for you
 
-    $ rake django-admin[syncdb]
-    $ rake django-admin[migrate]
-
-If you are running these commands using the [`zsh`](http://www.zsh.org/) shell,
-zsh will assume that you are doing
-[shell globbing](https://en.wikipedia.org/wiki/Glob_%28programming%29), search for
-a file in your directory named `django-adminsyncdb` or `django-adminmigrate`,
-and fail. To fix this, just surround the argument with quotation marks, so that
-you're running `rake "django-admin[syncdb]"`.
+    $ ./manage.py lms syncdb --migrate
+    $ ./manage.py cms syncdb --migrate
 
 Run Your Project
 ----------------
 edX has two components: Studio, the course authoring system; and the LMS
 (learning management system) used by students. These two systems communicate
 through the MongoDB database, which stores course information.
 
+We use [`rake`](http://rake.rubyforge.org/) to execute common tasks in our
+project. The `rake` tasks are defined in the `rakefile`, or you can run `rake -T`
+to view a summary.
+
 To run Studio, run:
 
     $ rake cms

diff --git a/bin/bourbon b/bin/bourbon
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'bourbon' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('bourbon', 'bourbon')
diff --git a/bin/launchy b/bin/launchy
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'launchy' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('launchy', 'launchy')
diff --git a/bin/neat b/bin/neat
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'neat' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('neat', 'neat')
diff --git a/bin/rake b/bin/rake
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')
diff --git a/bin/sass b/bin/sass
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'sass' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('sass', 'sass')