Commit Graph

7303 Commits

Author SHA1 Message Date
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
Adam Palay
c305fc386c fix regression for stringresponse problems with unspecified case sensitivity (BLD-710)
write failing tests
2014-01-27 11:40:38 -05:00
polesye
2cee94ea14 BLD-711: Fix offest in FF. 2014-01-27 16:22:12 +02:00
Alexander Kryklia
688d47fb62 Give numerical response tolerance as a range (for example [5,7)) (BLD-25) 2014-01-27 14:58:19 +02:00
polesye
b8eba4192c BLD-699: Fix i18n. 2014-01-27 07:49:22 +02:00
Will Daly
4b56fc2968 Merge pull request #2301 from edx/will/bok-choy-coverage
Collect coverage for bok-choy tests
2014-01-25 08:39:14 -08:00
Sarina Canelake
48a5c76066 Merge pull request #2295 from edx/sarina/i19-xmodules
i18n Sequence XModule
2014-01-24 17:15:08 -08:00
Giulio Gratta
0429ba7da3 Fixed all instances of "occured" typo 2014-01-24 16:13:26 -08:00
Will Daly
23a1947a62 Collect coverage for bok-choy tests 2014-01-24 16:58:24 -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
Sarina Canelake
b8b1f6a576 i18n Sequence XModule
LMS-1758
2014-01-24 11:06:57 -05: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
Greg Price
7e8d700bde Merge pull request #2267 from edx/gprice/timeago-better-i18n
Modify jquery.timeago to better support i18n
2014-01-24 07:32:39 -08:00
Sarina Canelake
623c985d38 Merge pull request #2286 from edx/sarina/i19-xmodules
i18n xmodule/course_module.py
2014-01-24 03:31:47 -08: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
David Baumgold
5d06c8bcd3 Merge pull request #2279 from edx/db/remove-pil-comment
Remove comment for how to install PIL
2014-01-23 12:06:59 -08:00
Sarina Canelake
f88c108527 i18n xmodule/course_module.py
LMS-1747
2014-01-23 15:05:05 -05:00
polesye
1d74838698 BLD-237: Persist speed preferences between videos. 2014-01-23 20:54:40 +02: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
David Baumgold
0b0ea51521 Remove comment for how to install PIL
We use Pillow now, which can be installed via PyPI
2014-01-23 11:23:12 -05:00
Jay Zoldak
636122c0b9 Merge pull request #2277 from edx/zoldak/move-microsite-test-assets
Enable microsite tests
2014-01-23 08:17:27 -08:00
Valera Rozuvan
f44489ea57 Merge pull request #2272 from edx/valera/make_video_debug_messages_consistent
Make video debug messages consistent.
2014-01-23 07:53:29 -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
Ned Batchelder
9069e413fe Merge pull request #2247 from jazkarta/pluggable-problem-types
Make problem types pluggable.
2014-01-23 07:10:48 -08:00
Valera Rozuvan
7a12d3b2fb Merge pull request #2273 from edx/valera/fix_video_progress_slider_method
Fix video progress slider method.
2014-01-23 05:36:33 -08:00
Valera Rozuvan
f0c3916b97 Fix video code duplication.
rangeParams returned from getRangeParams() function is already
an object that contains the left and width properties. It can
be passed directly to the jQuery css() function.
2014-01-23 12:11:50 +02:00
Valera Rozuvan
a673cbd9c6 Fix video progress slider method.
In each Video JavaScript module, methods are either private,
or public. When a method is public, it is made available via
the state variable. It seems that a while ago one method
was made public, but throughout the code it is used as a private
method. This has been corrected.
2014-01-23 12:06:43 +02:00
Valera Rozuvan
0dcd283e6e Make video debug messages consistent.
In the JavaScript console all messages from the Video
player should begin with "[Video info]: ". This way it
is easier to see which console.log() messages are from
the Video player, and which console.log() messages are
temporary, and should be removed before a merge/commit.
2014-01-23 11:56:19 +02:00
polesye
645007f910 BLD-364: Merge "video sources" and "download video" fields. 2014-01-23 11:27:28 +02:00
Chris Rossi
32a5fc0e54 Make problem types pluggable.
This patch adds the ability for arbitrary packages to register
themselves with xmodule.x_module.ResourceTemplates as being providers of
boiler plate templates used for defining the types of problems
instructors can add to a course.  This allows third party add-ons to
define new problem types that can then be available to instructors to
use.

This patch is the result of discussion with Ned Batchelder on the right
way to approach this problem.  The solution provided here is,
admittedly, a little bit of a hack.  But the focus was on making a least
invasive fix to make something work, in anticipation that when problems
get moved into the newere XBlock architecture something a little nicer
will be in place.
2014-01-22 21:33:24 -05:00
Greg Price
a83e2c7068 Modify jquery.timeago to better support i18n
Use string interpolation instead of concatenation of prefix, content,
and suffix. This is motivated by the fact that Transifex does not accept
empty strings for translation (even when pgettext is used to provide
context).
2014-01-22 17:58:59 -05:00
Don Mitchell
98eecf1369 Merge pull request #2244 from edx/dhm/role_package_id
Create mapping for previously unmapped locations in order to get
2014-01-22 14:01:42 -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
Don Mitchell
9d6ed66e24 Add loc mapper fn from locn to CourseLocator 2014-01-22 11:49:03 -05:00
polesye
4a36fa892b BLD-368: Turn "download transcript" into a dropdown. 2014-01-22 18:25:03 +02:00
jsa
168445f7c8 i18n: extract strings from underscore templates
JIRA: FOR-400
2014-01-22 11:07:35 -05:00
Greg Price
e634586882 Merge pull request #2222 from edx/gprice/forum-new-post-buttons
Fix forum buttons
2014-01-22 08:04:35 -08: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
Valera Rozuvan
b6e5db02ee Addressing comments for PR 2176.
BLD-529.
2014-01-22 16:39:00 +02:00
Valera Rozuvan
d778ab7118 Added Jasmine test for initial retrieval of duration.
BLD-529.
2014-01-22 16:38:45 +02:00
Valera Rozuvan
215816b59c Start-end time range always shown, even before video plays.
BLD-529.
2014-01-22 16:38:38 +02:00
Valera Rozuvan
33031b76f4 Enable correct total time display in VCR for YouTube videos.
Before this, the VCR showed total time as 00:00:00 for YouTube
videos just after page loaded. The correct total time is shown only
after the user clicks Play button.

BLD-529.
2014-01-22 16:38:24 +02: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
Anton Stupak
591470df3a Merge pull request #2229 from edx/anton/cookie-storage
Video: Add utility to work with cookies.
2014-01-22 01:51:15 -08: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
32e0021260 Create mapping for previously unmapped locations in order to get
course_id

STUD-1212
2014-01-21 13:10:07 -05:00
zubair-arbi
7bdcc84857 Merge pull request #2214 from zubair-arbi/zub/story/std1183-staticpagestest
enable tests depending on assert is_css_present(css_selector)
2014-01-21 06:50:27 -08:00
polesye
a41df03c64 Move README to docs. 2014-01-21 13:56:32 +02:00
polesye
ee4178e7f5 Add CookieStorage. 2014-01-21 11:51:41 +02: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