Commit Graph

3297 Commits

Author SHA1 Message Date
Diana Huang
5cfb42fc0f Change the from address for LinkedIn emails 2014-01-30 11:58:28 -05:00
Chris Dodge
3554c52a20 update test to reflect that the non-microsite homepage has been changed to remove all the partnership content 2014-01-30 10:26:13 -05:00
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02: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
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
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
polesye
642c239a01 Fix speed persistence per video. 2014-01-29 16:49:39 +02: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
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
jorr
58c76afa9e Use the publish() api from xblock.runtime.Runtime 2014-01-28 14:16:34 -08:00
Dave St.Germain
6d50ff7b61 Set the html language to the browser's specified language 2014-01-28 16:43:29 -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
Waheed Ahmed
d5cadf0008 Really large posts to ORA like peer grading feedback fixed.
ORA-201
2014-01-28 15:50:16 +05:00
Christina Roberts
cd7f1d92a1 Merge pull request #2299 from lduarte1991/master
Text and Video Annotation Modules - First Iteration
2014-01-27 11:18:32 -08:00
daniel cebrian
7e2652b5a8 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.
2014-01-27 13:47:58 -05:00
Giulio Gratta
78c85ea3b2 Merge pull request #2308 from edx/giulio/fix-error-msg-typo
Fixed all instances of "occured" typo
2014-01-27 10:46:13 -08:00
Giulio Gratta
0429ba7da3 Fixed all instances of "occured" typo 2014-01-24 16:13:26 -08:00
Joe Blaylock
e263b33f17 Merge pull request #2227 from edx/jrbl/fix_cert_whitelist_report
Certs - bugfix cert_whitelist output
2014-01-24 15:11:37 -08:00
Joe Blaylock
6a2fbf7175 Merge pull request #2290 from edx/jrbl/mdx_stop_printing
Eliminate unused import and gratuitous prints
2014-01-24 14:24:24 -08:00
Chris Dodge
8262b6564e pep8 cleanup 2014-01-24 11:59:56 -05:00
chrisndodge
88391c7ec6 Merge pull request #2278 from edx/cdodge/session-inactivity-timeout
add middleware to be able to expire inactive sessions after N seconds
2014-01-24 08:25:24 -08:00
Chris Dodge
fcefada2d7 add middleware to be able to expire inactive sessions after N seconds
configure middleware

add test for session inactive timeouts

add Studio inactive session timeout test

change login method used

add create_test_account to test

make sure the expected redirect URL is right

fix indenting problem

fix doc string since we moved from minutes to seconds

use utility methods rather than calling another test to set up and activate an account

clean up code violations

respond to PR feedback

use optional params to make code cleaner

pylint fix on test files
2014-01-24 10:36:21 -05:00
Usman Khalid
c296498806 Merge pull request #2291 from edx/usman/fix-openended-post-command-tests
Fixed flaky test for instructor command openended_post.
2014-01-24 06:12:09 -08:00
Usman Khalid
e0ecf011bd Fixed flaky test for instructor command openended_post.
The submission time is serialized into json and sent to xqueue. Previously the
whole json body argument to send_to_queue() was being matched. Sometimes the
time calculated in the test would differ slightly from the time calculated in
send_to_grader() and the test would fail. This fix tests individual fields of
the body argument to mock_send_to_queue() instead.
2014-01-24 18:35:25 +05:00
Oleg Marshev
ec6d9d585a Allow user with BetaTester role correctly use LTI. BLD-641. 2014-01-24 14:42:14 +02:00
Anton Stupak
dfc474178e Merge pull request #2230 from edx/anton/store-video-state
Persist speed preferences between videos.
2014-01-23 23:26:54 -08:00
Joe Blaylock
9c803825ff Eliminate unused import and gratuitous prints 2014-01-23 16:12:18 -08:00
polesye
1d74838698 BLD-237: Persist speed preferences between videos. 2014-01-23 20:54:40 +02:00
Jason Bau
d9f98b84b7 Merge pull request #2226 from edx/jbau/resubscribe-notifer
resubscribe feature for notifier
2014-01-23 10:29:00 -08:00
Anton Stupak
5bacfcc32b Merge pull request #2045 from edx/anton/video-merge-fields
Merge "video sources" and "download video" into the same field
2014-01-23 09:31:11 -08:00
Jay Zoldak
538ecf4852 Enable microsite tests
Move microsite test assets to common/test

Rename helper method to not have test in the name
Rename test css file
2014-01-23 10:42:51 -05:00
polesye
645007f910 BLD-364: Merge "video sources" and "download video" fields. 2014-01-23 11:27:28 +02:00
Carson Gee
ef8671ad7e Merge pull request #2263 from carsongee/cg/gitlog_course_not_found_exception
Correct exception raising bug for non global staff accessing missing course git logs
2014-01-22 12:25:58 -08:00
Carson Gee
f688fd319c Merge pull request #2262 from carsongee/cg/improved_git_import_debug_logging
Add additional logging for importing course from git
2014-01-22 12:12:50 -08:00
Anton Stupak
2ef095d9b5 Merge pull request #2149 from edx/anton/video-download-transcript
Allows students to download the transcript of the video without timecodes
2014-01-22 12:03:41 -08:00
Carson Gee
7d86124586 Add additional logging for importing course from git 2014-01-22 14:22:06 -05:00
Carson Gee
3aecac7adb Correct exception raising bug for non global staff accessing missing course git logs 2014-01-22 14:03:06 -05:00
Jason Bau
dfacbbdd69 Notifier re-subcribe via link
* fix assertPrefValid in tests to decrypt instead of compare
* rename unsubscribe -> set_subscribe
2014-01-22 09:54:27 -08:00
polesye
4a36fa892b BLD-368: Turn "download transcript" into a dropdown. 2014-01-22 18:25:03 +02:00
Calen Pennington
4d4288f418 Merge pull request #2249 from cpennington/non-ascii-course-images
Fix non-ascii course image names
2014-01-22 07:50:13 -08:00
Diana Huang
5a16817e3c Remove authority name from url. 2014-01-22 10:05:17 -05:00
Calen Pennington
a6035698d5 Correctly compute course image location when using mongo modulestore
[LMS-2073]
[STUD-1197]
2014-01-22 07:17:40 -05:00
Calen Pennington
923c2ff46e Add failing tests for course image names
Tests LMS-2073 (non-ascii course image names) and STUD-1197 (spaces in
course image names)
2014-01-22 07:16:30 -05:00
Greg Price
f5bdec8ae9 Merge pull request #2204 from edx/gprice/mustache-i18n
Internationalize forums mustache templates
2014-01-21 13:49:41 -08:00
Greg Price
f75a7e08cd Internationalize forums mustache templates 2014-01-21 15:57:57 -05:00
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release
Merging Release 2014-01-21
2014-01-21 12:41:05 -08:00
Don Mitchell
003ad76c64 Merge pull request #2209 from edx/db/lms_date_agnostic
Detached categories don't access control on date
2014-01-19 08:46:28 -08:00
Jason Bau
8abfdc6309 add undo (resub) to landing page of forum unsub link 2014-01-17 18:07:33 -08:00
Joe Blaylock
300501b138 Certs - bugfix cert_whitelist output
* output after cert_whitelist -a or -d purported to be the whitelist entries
  for the requested course, but in fact were all of the entries in every
  course. This commit fixes that.
2014-01-17 17:43:09 -08:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00