Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,585 Commits 1 Branch 0 Tags
24232dbc8f9e4e8ce371a287d34904b8663e893f
Commit Graph

7285 Commits

Author SHA1 Message Date
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
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
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
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Sarina Canelake
7f74297810 Merge pull request #2219 from edx/sarina/i19-capa-new 
i19 base capa strings
 2014-01-17 14:41:05 -08:00
Sarina Canelake
0efa75d6f5 i18n of common/lib/capa/capa files 
Also pep8, pylint, and style fixes
Covers:
{capa_problem, correctmap, customerender,
inputtypes, responsetypes, util, xqueue_interface}.py
LMS-1744
 2014-01-17 16:39:50 -05:00
Greg Price
60fb3cfbb2 Make forum New Post buttons behave as buttons 
JIRA: FOR-205
 2014-01-17 16:38:51 -05:00
Greg Price
2014d34c8a Fix forum button keyboard activation 
Previously, buttons were activated on pressing Enter, but the expected
behavior is to activate on pressing Space. Several JavaScript errors
that prevented various buttons from properly activating via the keyboard
are also fixed.
 2014-01-17 16:38:51 -05:00
Adam
439037d827 Merge pull request #2084 from edx/adam/remove_unsure_button 
removes unsure button (ORA-254)
 2014-01-17 12:24:43 -08:00
Sarina Canelake
3584b246dd Translate strings in xmodule/capa_*.py 
LMS-1744
 2014-01-17 15:01:59 -05:00
Jim Abramson
264bba94ea Merge pull request #2217 from edx/bug/jsa/for-203 
expand forums' search text input whenever the field receives focus.
 2014-01-17 11:48:45 -08:00
Adam Palay
013549a39e removes unsure button (ORA-254) 2014-01-17 14:41:54 -05:00
jsa
22d6c6806b expand forums' search text input whenever the field receives focus. 
JIRA: FOR-203
 2014-01-17 14:13:40 -05:00
Ned Batchelder
42c543b7ab Merge pull request #2183 from edx/ned/add-i18n-for-inputtypes 
Ned/add i18n for inputtypes
 2014-01-17 09:57:32 -08:00
Don Mitchell
e74ddf8131 Merge branch 'release' 2014-01-17 12:49:15 -05:00
Ned Batchelder
fe5d2c74f8 Use self.runtime instead of self.system 
[LMS-1597]
 2014-01-17 11:33:23 -05:00
Ned Batchelder
4aa4c514ee Add i18n attribute to LoncapaSystem 
[LMS-1597]
 2014-01-17 11:33:09 -05:00
Ned Batchelder
d2146978ea Give LoncapaProblem its own LoncapaSystem instead of ModuleSystem 
LoncapaProblem was using ModuleSystem directly, but we're about to need
i18n passed in, so this gives LoncapaProblem its own LoncapaSystem
object to better module its dependencies.  This commit simply passes
through the attributes of ModuleSystem that Loncapa needs.

[LMS-1597]
 2014-01-17 11:32:54 -05:00
zubiar-arbi
dc570859da enable tests depending on assert is_css_present(css_selector) 
STUD-1183
 2014-01-17 21:11:17 +05:00
Chris Dodge
c9718380ea catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting 
one more faulty login regarding ENABLE_MKTG_SITE=true situations
 2014-01-16 17:04:17 -05:00
David Ormsbee
a18bce81f2 Basic cleanup of code to determine whether a user has a LinkedIn account. 2014-01-16 17:03:15 -05:00