Commit Graph

20767 Commits

Author SHA1 Message Date
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
Waheed Ahmed
c21e012d8b Merge pull request #2241 from edx/waheed/ora256-reflected-xss-in-ora-submissions-fix
Fixed allowing for execution of arbitrary Javascript in student response
2014-01-30 04:14:28 -08:00
Waheed Ahmed
d12e7e8877 Fixed allowing for execution of arbitrary Javascript in student response.
ORA-256
2014-01-30 16:17:48 +05:00
Anton Stupak
a077dc815c Merge pull request #2352 from edx/anton/fix-persist-speed-per-video
Video: Fix speed persistence per video.
2014-01-30 00:04:31 -08:00
Valera Rozuvan
ec8a86f2a2 Merge pull request #2347 from edx/valera/update_docs_mongodb
Updated internal documentation on MongoDB.
2014-01-29 19:18:59 -08:00
Matt Drayer
d35667384a Merge branch 'release'
Conflicts:
	requirements/edx/base.txt
2014-01-29 16:19:30 -05:00
David Baumgold
a0bc10a1c3 Merge pull request #2357 from edx/db/move-doc-url-func
Move doc_url function out of edxmako middleware
2014-01-29 12:59:31 -08:00
David Baumgold
e7c5e62da7 Read from doc url mapping file at load time, rather than once per request 2014-01-29 15:28:40 -05:00
David Baumgold
b25b3e1bef Move doc_url function out of edxmako middleware 2014-01-29 14:52:43 -05:00
Jim Abramson
74067b80e3 Merge pull request #2266 from edx/jsa/forums-response-button
add "Add A Response" button to thread views in discussion tab / inline
2014-01-29 11:48:32 -08:00
Jim Abramson
707f6388f4 Merge pull request #2344 from edx/jsa/forums-new-thread-attrs
Allow new response pagination parameters to pass through thread model.
2014-01-29 11:48:12 -08:00
Mark Hoeber
bf1b75f5c1 Merge pull request #2355 from edx/markhoeber/documentation/release-notes-1-28-14
Markhoeber/documentation/release notes 1 28 14
2014-01-29 11:02:45 -08:00
Valera Rozuvan
e64145cfaf Updated internal documentation on MongoDB.
Provided several suggestions what to do if MongoDB
daemon doesn't start.
2014-01-29 20:52:12 +02:00
Calen Pennington
ce19f2887c Merge pull request #2294 from cpennington/language-dark-launch
Add the ability to dark-launch languages
2014-01-29 10:52:06 -08:00
Calen Pennington
271fbdb40a Switch dark_lang to database backed configuration 2014-01-29 13:24:41 -05:00
Mark Hoeber
7a78a16d1a Added doc links 2014-01-29 13:17:22 -05:00
Mark Hoeber
9c6a7a3e86 Merge pull request #2342 from edx/markhoeber/documentation/stud-1191
Component Duplicate Documentation
2014-01-29 10:07:04 -08:00
Mark Hoeber
1596af2ac8 Merge pull request #2354 from edx/markhoeber/documentation/LMS-1601
Markhoeber/documentation/lms 1601
2014-01-29 10:05:17 -08:00
jorr-at-google
87aa71c450 Merge pull request #2309 from edx/jorr/feature/use-xblock-publish-api
Use the publish() api from xblock.runtime.Runtime
2014-01-29 09:25:33 -08:00
Mark Hoeber
f8cfdf0d83 Copy edit
From Alison’s input
2014-01-29 11:56:14 -05:00
Sylvia Pearce
c79aee1350 Add more information to release notes
Add info to release notes. Also add bookmark in Advanced Video Settings section so release notes can link to it.
2014-01-29 11:48:15 -05:00
Calen Pennington
c712668b05 Merge pull request #2292 from edx/sarina/make-dummy-executable
Convert i18n/make_dummy.py to a standalone script
2014-01-29 08:18:39 -08:00
chrisndodge
7162aa66f3 Merge pull request #2285 from antoviaque/registration-extra-fields
Registration extra fields: Selectively require/hide registration fields & add optional country/city fields
2014-01-29 08:09:53 -08:00
Will Daly
b60487c85c Pin subunit and testtools libraries to prevent test failures after release of these libraries on 1/29/14 2014-01-29 11:01:14 -05:00
Alexander Kryklia
4234daeb46 Merge pull request #2353 from edx/alex/no_error_on_empty_answer_to_master
Alex/no error on empty answer to master
2014-01-29 07:05:40 -08:00
Calen Pennington
c0470008ba Make i18n dummy dummy-ify all source english strings (rather than a static list) 2014-01-29 09:57:56 -05:00
polesye
642c239a01 Fix speed persistence per video. 2014-01-29 16:49:39 +02:00
Mark Hoeber
5728518b7d Fixed link 2014-01-29 09:39:22 -05:00
Calen Pennington
8424f610d5 Merge pull request #2171 from cpennington/pylint-cleanup
Fix pylint violations from #2129
2014-01-29 06:38:17 -08:00
Mark Hoeber
f72e9d29d5 Fixed link 2014-01-29 09:35:20 -05:00
Will Daly
021bece881 Merge pull request #2239 from edx/will/ora-ai-and-peer-tests
ORA AI and Peer acceptance tests
2014-01-29 06:28:39 -08:00
Mark Hoeber
735b84039c First draft 1-29-14 release notes 2014-01-29 09:27:42 -05:00
Calen Pennington
d379b35fa9 Add config_model, a library for database backed configuration
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]
2014-01-29 09:17:19 -05:00
Calen Pennington
881e3ba564 Add the ability to dark-launch languages
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]
2014-01-29 09:16:16 -05:00
Alexander Kryklia
9876c993c5 Fix test for isnan student answer. 2014-01-29 16:07:26 +02:00
Alexander Kryklia
2653e9634a Should not raise exception on empty answer. 2014-01-29 16:07:19 +02:00
Xavier Antoviaque
386115aecf Selectively require/hide registration fields & add country/city fields
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.
2014-01-29 09:01:28 -05:00
daniel cebrian
38798b91c4 annotation tools
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
2014-01-29 08:52:44 -05:00
Will Daly
ce2c067da9 Merge pull request #2351 from edx/will/pin-test-lib-versions
Pin test lib versions (fix to test failures in master)
2014-01-29 05:34:22 -08:00
Will Daly
382fa9be1f Pin subunit and testtools libraries to prevent test failures after release of these libraries on 1/29/14 2014-01-29 08:08:40 -05:00
jsa
40fcc6b9a5 Allow new response pagination parameters to pass through thread model.
JIRA: FOR-374
2014-01-28 17:24:37 -05:00
jorr
58c76afa9e Use the publish() api from xblock.runtime.Runtime 2014-01-28 14:16:34 -08:00
jsa
9b54abe308 add "Add A Response" button to thread views in discussion tab / inline
JIRA: FOR-373
2014-01-28 17:13:16 -05:00
davestgermain
b18945d1cf Merge pull request #2332 from edx/dstgermain/a11y-html-lang
Set the HTML language to the browser's specified language
2014-01-28 13:44:21 -08:00
Dave St.Germain
6d50ff7b61 Set the html language to the browser's specified language 2014-01-28 16:43:29 -05:00
Mark Hoeber
c4465be45f Component Duplicate Documentation
Updated document and all instances of component screen shots
2014-01-28 15:19:09 -05:00
Will Daly
b73c6f63fc Added stub XQueue server to bok_choy test suite.
Added feedback check for AI-assessment test

Added peer assessment feedback test
2014-01-28 14:57:28 -05:00
Will Daly
a6b97b402f Merge pull request #2340 from edx/will/disable-transcript-test
Disable transcript test
2014-01-28 11:03:54 -08:00
Matt Drayer
a410e50940 Merge pull request #2339 from edx/dhm/bug_perf_loc
Dhm/bug perf loc
2014-01-28 11:01:08 -08:00
Will Daly
eb55ed1930 Disable transcript test 2014-01-28 14:00:54 -05:00