Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,647 Commits 1 Branch 0 Tags
010905eb996bc4e2f6391bf115e74d4cbaf6a00a
Commit Graph

4988 Commits

Author SHA1 Message Date
Don Mitchell
010905eb99 RESTful api for getting course listing and opening course in studio. 
Pattern for how to do refactoring from locations to locators and from
old style urls to restful ones.
 2013-10-16 16:54:31 -04:00
Valera Rozuvan
a7f3bb2b00 Added back on hover CC button functionality. 
Fixing falling test. Added fix for RequireJS & XModule loader video race condition.
Removed unnecessary comments from SCSS and JS files.
Added entry to Change Log.
 2013-10-16 12:02:19 +03:00
Ned Batchelder
25a027475d Rename contentstore/views/requests to helpers 
This has caused confusion, since this file gets imported when trying to
import the requests library.  And besides, how was this file about
requests in the first place?  Helpers is a much better name.
 2013-10-15 15:53:48 -04:00
Carlos Andrés Rocha
15852cd816 Modify export_to_xml to take an optional contentstore and work with xml courses 2013-10-15 10:48:59 -04:00
Valera Rozuvan
06a85e6ef5 Minor styling tweaks. Added Changelog entry. 
Made it so that the link and the text are on the same level, and in the
center of the block.
 2013-10-14 13:59:10 +03:00
Frances Botsford
2877345b79 styling for LTI in a new window block 2013-10-14 13:58:18 +03:00
Valera Rozuvan
068d0ce692 Added back check in JS for empty or default URL. 2013-10-14 13:58:18 +03:00
Valera Rozuvan
3c6591e065 Addressing comments by auraz and singingwolfboy. 
Removed JS check for empty url and default url. In template added
i18n support for several strings.
 2013-10-14 13:58:18 +03:00
Alexander Kryklia
f9b64cad32 Add display_name to lti template 2013-10-14 13:58:18 +03:00
Valera Rozuvan
a950bb7327 Oops. Forgot to delete one more template. 2013-10-14 13:58:17 +03:00
Valera Rozuvan
67463da059 Updated Jasmine tests as per Anton's and Alex's suggestions. 2013-10-14 13:58:17 +03:00
Alexander Kryklia
a03c5be6de New feature for lti module. 
Add ability to display LTI module in a new
window. Iframe will be still supported.

Fix python test
Update acceptance tests
Fix in acceptance tests, they are stable now
Fix Acceptance tests.
Adding Jasmine tests for LTI.
Fixing Jasmine tests. Adding the rest of Jasmine tests.
 2013-10-14 13:58:17 +03:00
polesye
1113411293 Fix multiple LTI tools per page. 2013-10-12 09:39:18 +03:00
Vik Paruchuri
751073895d Merge pull request #1302 from edx/fix/vik/oe-accessibility 
Various open ended accessibility fixes
 2013-10-11 14:17:23 -07:00
Vik Paruchuri
0accbaee07 Various open ended accessibility fixes 2013-10-11 15:00:55 -04:00
John Jarvis
92a7d75b5d Merge pull request #1305 from edx/jarv/revert-1240 
Revert "Merge pull request #1240 from edx/dhm/config_separation"
 2013-10-10 10:27:58 -07:00
chrisndodge
82e42cc580 Merge pull request #1156 from edx/feature/cdodge/add-preview-configs-via-middleware 
add some middleware to determine whether draft modulestore or non-draft ...
 2013-10-10 10:24:51 -07:00
John Jarvis
a517dc2085 Revert "Merge pull request #1240 from edx/dhm/config_separation" 
This reverts commit ec01253e30, reversing
changes made to ae8c9710e5.
 2013-10-10 13:14:08 -04:00
frances botsford
187fc8ea1c Merge pull request #1280 from edx/fix/frances/lms-video-dl-buttons2 
Improving the video and transcript download buttons
 2013-10-10 07:10:38 -07:00
Frances Botsford
5d509c2e08 addressing review feedback on video buttons - switched to use themeable color variables 2013-10-10 10:09:43 -04:00
Jay Zoldak
ce8eaa713e Merge pull request #1284 from edx/zoldak/fix-video-js-test 
Fix intermittently failing video js tests
 2013-10-09 15:08:23 -07:00
Ned Batchelder
d42a350784 Merge pull request #1279 from edx/ned/remove-cache-warning-from-tests 
Remove the now-unused import.
 2013-10-09 13:33:35 -07:00
Don Mitchell
ec01253e30 Merge pull request #1240 from edx/dhm/config_separation 
Segregate the mongo db config from the modulestore config
 2013-10-09 13:24:30 -07:00
David Baumgold
6c747e31bc Merge pull request #1273 from edx/db/fix-drag-and-drop-requirejs 
make drag_and_drop component work with requirejs and changed static url
 2013-10-09 12:16:55 -07:00
Jay Zoldak
ac4ac23d25 Fix intermittently failing video js tests 2013-10-09 15:16:45 -04:00
Frances Botsford
729c0bca09 updating video download links to a list - review feedback 2013-10-09 14:40:01 -04:00
Frances Botsford
5653112f5e ux cleanup of video and transcript download buttons 2013-10-09 12:02:09 -04:00
Chris Dodge
8f9d815f10 add some middleware to determine whether draft modulestore or non-draft modulestore should be used 
change to use regex to do the domain mappings. Also add config to AWS to be able to set from configuration file.

handle cases where HTTP_HOST is none, like in unit tests

add linefeed at end

fix up regex matches

switch to use thread local storage to hold the request itself

.

.

convert over to use open source 3rd party library

convert over to use django-cum

add unit test

remove comment

.

add comment to config setting

fix comment

use better regex for localdev

no need to break

no need to wrap an imported function, it's visible to any file that is importing us

add comment

add unit test

clean up test

use a separate env file to set the preview hostname
 2013-10-09 11:53:26 -04:00
Ned Batchelder
9cd0771fd0 Merge pull request #1272 from edx/ned/remove-cache-warning-from-tests 
Use a better metadata_cache_key
 2013-10-09 08:18:46 -07:00
David Baumgold
e53680bb92 make drag_and_drop component work with requirejs and changed static url 2013-10-09 10:26:22 -04:00
Calen Pennington
46ed857c1a Merge pull request #1221 from cpennington/lms-xblock-css-js 
Put XBlock css and javascript onto the LMS courseware page
 2013-10-09 07:21:39 -07:00
Ned Batchelder
13f120b0ca Remove the now-unused import. 2013-10-09 10:03:46 -04:00
Calen Pennington
2514dca550 Put XBlock css and javascript onto the LMS courseware page 
This required changing structural XModules to fully implement
student_view, rather than just returning the HTML of their children in a
get_html call.

[LMS-223]
[LMS-1170]
 2013-10-09 09:40:47 -04:00
Ned Batchelder
192222f2cc Use a better metadata_cache_key 
The old code created keys like "('course', 'org')", and the space
character caused a warning from Django during tests.  Also, strings are
probably better than tuples for keys.
 2013-10-09 09:27:25 -04:00
Carlos Andrés Rocha
779ff4fd38 Merge pull request #1245 from rocha/add-grade-to-problem-check-event 
Add module grade to problem_check tracking log event
 2013-10-08 14:00:07 -07:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Calen Pennington
d785b1e213 Convert due_date_display_format tests to use factories 
Previously, these tests modified due_date, which failed due to the new
restrictions on writing to Scope.settings from the LMS.
 2013-10-08 15:29:17 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class 
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
 2013-10-08 15:29:17 -04:00
Don Mitchell
44d0494d33 Segregate the mongo db config from the modulestore config 
as a first step to separating db connection from modeling
and to support location mapper and contentstore using same db config as modulestore
 2013-10-08 15:01:48 -04:00
Carlos Andrés Rocha
7749bbbe51 Add module grade to problem_check tracking log event 2013-10-08 13:53:35 -04:00
Ned Batchelder
a03a11e0e7 Merge pull request #1253 from edx/ned/use-assertisinstance 
Use assertIsInstance where we can
 2013-10-08 07:47:21 -07:00
Valera Rozuvan
2cc25873e9 Fixing Jean Michel access. bug. 2013-10-08 16:52:21 +03:00
Valera Rozuvan
deb0ad492a Enabling showing of captions always when mouse is over CC. 2013-10-08 12:00:08 +03:00
polesye
f57d5a61d3 Tidy up the code. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
92494ccdd4 Fixing minor typo. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
60c528a9be Minor tweak. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
b3a9f63de6 Furthe addressing comments on PR. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
95b74930f6 Fixing JS. 
There were previous merge conflicts in the file.
 2013-10-08 12:00:07 +03:00
Valera Rozuvan
fc43a81dbe Updated fixtures for Jasmine tests. 2013-10-08 12:00:06 +03:00
Valera Rozuvan
74cbe11934 Added functionality to show captions on "CC" button mousemove. 
When auto-show/auto-hide is disabled, the captions will be shown when
the user will move the mouse over the "CC" button. They will then
auto-hide after a while if the user doesn't continue to move the
mouse over the "CC" button, or over the captions themselves, or use
the keyboard to select a specific caption. If the mouse pointer is not
over the captions or the "CC" button, they will hide after a while.

This is the key in the fix for bug BLD-355: Transcript hovers over
over videoplayer itself for PKU videos.
 2013-10-08 12:00:06 +03:00