If this management command fails it's tough to figure out why without
seeing the text from the exception.  Luckily comment service does
return useful feedback, we just have to show it.  This one-line
change just add the exception text to the error message.

Before (with spurrious debug msgs removed):

    sefk@util1:~$ ./manage.sh reload_forum_users Anthonyhubendurance
    update user info to discussion failed for user with id: Anthonyhubendurance

After:

    sefk@util1:~$ ./manage.sh reload_forum_users Anthonyhubendurance
    update user info to discussion failed for user with id: Anthonyhubendurance, error=u'["Email is already taken"]'

No unit testing (sorry) added since this doesn't have coverage
already, and it's just a simple error case.

Conflicts:
	requirements/edx/base.txt

Move doc_url function out of edxmako middleware

add "Add A Response" button to thread views in discussion tab / inline

Allow new response pagination parameters to pass through thread model.

Markhoeber/documentation/release notes 1 28 14

Add the ability to dark-launch languages

Component Duplicate Documentation

Markhoeber/documentation/lms 1601

Use the publish() api from xblock.runtime.Runtime

From Alison’s input

Add info to release notes. Also add bookmark in Advanced Video Settings section so release notes can link to it.

Convert i18n/make_dummy.py to a standalone script

Registration extra fields: Selectively require/hide registration fields & add optional country/city fields

Pin subunit and testtools libraries to prevent test failures after release of these libraries on 1/29/14

Alex/no error on empty answer to master

Fix pylint violations from #2129

ORA AI and Peer acceptance tests

ConfigurationModels can be managed using the admin site. They are
append-only, and track the user who is making the change, and the time
that the change was made. The configuration is stored in the database,
and cached for performance.

[LMS-1220]

To mark a language as dark-launched, add it to the DARK_LANGUAGES
django conf setting. To activate a dark-launched language, set he
query parameter `preview-lang` to the language code on any url.

[LMS-2045]
[LMS-2077]
[LMS-2076]

Extend the capabilities of the REGISTRATION_OPTIONAL_FIELDS
configuration variable, to allow to select, for each individual field,
if it should be 'hidden', 'optional' or 'required'.

Rename the configuration variable to REGISTRATION_EXTRA_FIELDS to reflect
the additional capabilities, and updates the defaults.

As extra fields, configurable through the REGISTRATION_EXTRA_FIELDS
variable. Hidden by default.

Tickets: MCKIN-168 MCKIN-184

Note: Studio also has a registration page, which uses the same account
creation page. It should be possible to use it without requiring the
variable from the LMS, as the fields are different.

First set of fixes from the pull request

This does not include some of the testing files. The textannotation and
videoannotation test files are not ready. waiting for an answer on the
issue.

Deleted token line in api.py and added test for token generator

Added notes_spec.coffee

remove spec file

fixed minor error with the test

fixes some quality errors

fixed unit test

fixed unit test

added advanced module

Added notes_spec.coffee

remove spec file

Quality and  Testing Coverage

1. in test_textannotation.py I already check for line 75 as it states
in the diff in line 43, same with test_videoanntotation
2. Like you said, exceptions cannot be checked for
firebase_token_generator.py. The version of python that is active on
the edx server is 2.7 or higher, but the code is there for correctness.
Error checking works the same way.
3. I added a test for student/views/.py within tests and deleted the
unused secret assignment.
4. test_token_generator.py is now its own file

Added Secret Token data input

fixed token generator

Annotation Tools in Place

The purpose of this pull request is to install two major modules: (1) a
module to annotate text and (2) a module to annotate video. In either
case an instructor can declare them in advanced settings under
advanced_modules and input content (HTML in text, mp4 or YouTube videos
for video). Students will be able to highlight portions and add their
comments as well as reply to each other. There needs to be a storage
server set up per course as well as a secret token to talk with said
storage.

Changes:
1. Added test to check for the creation of a token in tests.py (along
with the rest of the tests for student/view.py)
2. Removed items in cms pertaining to annotation as this will only be
possible in the lms
3. Added more comments to firebase_token_generator.py, the test files,
students/views.py
4. Added some internationalization stuff to textannotation.html and
videoannotation.html. I need some help with doing it in javascript, but
the html is covered.

incorporated lib for traslate

fixed quality errors

fixed my notes with catch token

Text and Video Annotation Modules - First Iteration

The following code-change is the first iteration of the modules for
text and video annotation.

Installing Modules:
1. Under “Advanced Settings”, add “textannotation” and
“videoannotation” to the list of advanced_modules.
2. Add link to an external storage for annotations under
“annotation_storage_url”
3. Add the secret token for talking with said storage under
“annotation_token_secret”

Using Modules
1. When creating  new unit, you can find Text and Video annotation
modules under “Advanced” component
2. Make sure you have either Text or Video in one unit, but not both.
3. Annotations are only allowed on Live/Public version and not Studio.

Added missing templates and fixed more of the quality errors

Fixed annotator not existing issue in cmd and tried to find the get_html() from the annotation module class to the descriptor

Added a space after # in comments

Fixed issue with an empty Module and token links

Added licenses and fixed vis naming scheme and location.

Updating Annotator CSS

The change in the css keeps fonts as they were and does not change them
purely based on annotating a section.

Fixed Annotation issue with static_url oversight

Pin test lib versions (fix to test failures in master)

Pin subunit and testtools libraries to prevent test failures after release of these libraries on 1/29/14

JIRA: FOR-374

JIRA: FOR-373

Set the HTML language to the browser's specified language

Updated document and all instances of component screen shots