Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Greg Price
3cebb4eae2 Merge pull request #1264 from edx/gprice/fix-release-email-script 
Fix bug that omits commits in release email script
 2013-10-08 12:23:29 -07:00
Greg Price
6b7749f25e Fix bug that omits commits in release email script 
The command built to generate the list of commits committed but not
authored by a particular individual was incorrect, so some commits
were incorrectly omitted in the table as entries belonging to the
committer.
 2013-10-08 15:22:57 -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
f2bf95b205 Add variable to set location of config files on aws 
The env variable CONFIG_ROOT is used to determine the location of the
JSON configuration files. This is useful when a deployment of the
platform is used to access different environments when executing django
commands.
 2013-10-08 14:46:18 -04:00
Will Daly
64e3624e16 Merge pull request #1262 from edx/will/disable-caption-test-2 
Disable another video caption test
 2013-10-08 11:33:01 -07:00
Will Daly
774dd03668 Disable another video caption test 2013-10-08 14:07:35 -04:00
Carlos Andrés Rocha
7749bbbe51 Add module grade to problem_check tracking log event 2013-10-08 13:53:35 -04:00
Carlos Andrés Rocha
b2cd0d28d1 Merge pull request #1229 from rocha/cleanup-eventtracking-mongo-authentication 
Cleanup mongodb authentication
 2013-10-08 10:46:33 -07:00
Will Daly
7a214344e5 Merge pull request #1261 from edx/will/disable-caption-tests 
Disabled video caption acceptance tests
 2013-10-08 10:36:40 -07:00
Will Daly
7eb4522b32 Disabled video caption acceptance tests 2013-10-08 13:28:45 -04:00
Julia Hansbrough
1200703076 Merge pull request #1258 from edx/flowerhack/fix/htmleditor 
Defined baseUrl in the LMS template
 2013-10-08 10:15:46 -07:00
Julia Hansbrough
d93e96cbc3 Defined baseUrl in the LMS template, fixing a bug where HTML editors called within LMS would fail to load 2013-10-08 17:03:52 +00:00
Christina Roberts
c484dc6cbb Merge pull request #1255 from edx/db/requirejs-load-jquery 
load jquery in requirejs deps
 2013-10-08 09:28:50 -07:00
David Baumgold
eb07e0bd58 Remove unused setup_require.coffee file 2013-10-08 12:06:18 -04:00
David Baumgold
0e9c15bf7f Merge pull request #1256 from edx/db/fix-footer-image 
Fix static links for footer images
 2013-10-08 09:02:21 -07:00
Christina Roberts
814a218bfb Merge pull request #1254 from edx/christina/enable-overview-tests 
Re-enable tests that were failing on Jenkins.
 2013-10-08 08:46:09 -07:00
David Baumgold
f1a104754e load jquery in requirejs deps 2013-10-08 11:40:42 -04:00
David Baumgold
15b65fbecc Fix static links for footer images 2013-10-08 11:39:22 -04:00
Carlos Andrés Rocha
e0fb94cc55 Cleanup mongodb authentication 
Authenticate to the database before getting a reference to the
collection.
 2013-10-08 11:26:29 -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
Will Daly
560dac6ac5 Merge pull request #1242 from edx/will/disable-broken-tests 
Disable non-deterministic test to get stability on master
 2013-10-08 07:43:35 -07:00
Will Daly
7f29ac56fe Merge pull request #1244 from edx/will/fix-wordcloud 
Remove unnecessary call from wordcloud test
 2013-10-08 07:40:55 -07:00
Will Daly
c3bd7d3db8 Merge pull request #1243 from edx/will/fix-course-image-test 
Use wait_for to allow course image time to update
 2013-10-08 07:40:07 -07:00
Valera Rozuvan
e3c0bb839b Merge pull request #1183 from edx/valera/add_option_transcripts_remove_onhover 
Valera/add option transcripts remove onhover
 2013-10-08 07:37:02 -07:00
cahrens
9d31924793 Re-enable tests that were failing on Jenkins. 2013-10-08 10:23:47 -04:00
Christina Roberts
009deb7da8 Merge pull request #1236 from edx/christina/course-updates-bug 
Don't remove course update when clicking outside modal.
 2013-10-08 07:20:10 -07:00
Christina Roberts
c5733015fd Merge pull request #611 from edx/peter-fogg/draggabilly 
Rework drag/drop on overview and subsection pages.
 2013-10-08 07:14:34 -07:00
Adam
6418175a56 Merge pull request #1251 from edx/adam/remove-instr-dash-buttons 
re-enable some buttons on instr dash
 2013-10-08 07:04:25 -07:00
cahrens
1de194aaa4 Use RequireJS for test dependencies, and use domReady. 2013-10-08 09:55:15 -04: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
20c2b3dc71 Clean up the code. 2013-10-08 12:00:08 +03:00
polesye
a667349d85 Fix acceptance tests. 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
968215dd9f Updated acceptance tests. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
b7e82ed15e Updated acceptance tests. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
de1381dbfc Added acceptance tests. 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
Valera Rozuvan
812b085b84 Added hard-coded flag to video.html that turns on/off autohiding of captions. 
Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.
 2013-10-08 12:00:06 +03:00
Valera Rozuvan
62c445d001 Updated code fomat in test Jasmine. 2013-10-08 12:00:06 +03:00
Valera Rozuvan
38dfde1296 Work in progress. 2013-10-08 12:00:06 +03:00
Ned Batchelder
a4bf549af4 Use assertIsInstance instead of assertTrue(type(x) == y) 2013-10-07 18:20:31 -04:00
Ned Batchelder
9103fa393c Use assertIsInstance. 2013-10-07 18:17:40 -04:00
Adam Palay
c64399424e re-enable some buttons on instr dash 2013-10-07 18:13:21 -04:00