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

18241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
0bb11335b2 We aren't ready to use XBlock.load_class, there are duplicate entry point names, and simply choosing the first one leads to unpredictability. 2013-10-01 13:53:59 -04:00
Ned Batchelder
cdb80bb8ed Fix the new tests to use the new way to make XBlocks. 2013-09-30 21:09:44 -04:00
Ned Batchelder
718328e4e6 Get rid of all mention of XModuleDescriptor. 2013-09-30 21:09:43 -04:00
Ned Batchelder
a1d464aed9 Update XBlock requirement to new XML code. 2013-09-30 21:09:43 -04:00
Ned Batchelder
3a6450c3fc Use XModuleDescriptor.parse_xml to interpret XML. 2013-09-30 21:09:43 -04:00
Ned Batchelder
c36adf84a0 Minor cosmetic code fixes. 2013-09-30 21:09:43 -04:00
Ned Batchelder
d7e441088b Adjust parameters to construct_xblock_from_class to match XBlock repo. 2013-09-30 21:09:43 -04:00
jmclaus
e73bc906c8 Merge pull request #1134 from edx/jmclaus/bugfix_video_controls_focus_outline 
All video controls have a full outline when receiving focus
 2013-09-30 13:23:54 -07:00
jmclaus
aeac8dddbb All video controls have a full outline when receiving focus 2013-09-30 20:47:05 +02:00
Jason Bau
7d578e4f1f Update CHANGELOG.rst 2013-09-30 11:23:40 -07:00
Jason Bau
829d0d5dd0 Merge pull request #1174 from edx/jbau/fix/optional-enable-shopping-cart 
make ENABLE_SHOPPING_CART truly optional
 2013-09-30 11:05:38 -07:00
Jason Bau
06cac195f0 make ENABLE_SHOPPING_CART truly optional 
course_about was throwing 500s if ENABLE_SHOPPING_CART=False
 2013-09-30 09:09:17 -07:00
Carlos Andrés Rocha
16caf1cdb5 Merge pull request #1177 from rocha/fix-enrollment-counts 
Fix course enrollment count in instructor dashboard
 2013-09-30 09:07:10 -07:00
Ned Batchelder
7e8825757d Merge pull request #1176 from edx/ned/organize-gitignore 
Add .noseids to .gitignore, but first organize it.
 2013-09-30 09:06:32 -07:00
Carlos Andrés Rocha
2e7e354076 Fix course enrollment count in instructor dashboard 
Fix AN-115
 2013-09-30 11:41:49 -04:00
Ned Batchelder
0f3bb1e7cd Ignore .noseids files wherever they appear. 2013-09-30 11:10:44 -04:00
Ned Batchelder
486d32caae Rearrange and comment .gitignore so I can find things. 2013-09-30 11:09:34 -04:00
jmclaus
427f1184ae Merge pull request #1150 from edx/jmclaus/bugfix_outline_mouseover_first_caption 
First caption does not display outline on initial mouseover.
 2013-09-30 07:26:30 -07:00
Vik Paruchuri
577749ff80 Merge pull request #1163 from edx/fix/vik/image-upload 
Streamling, test, and fix issues with image uploading
 2013-09-27 15:34:23 -07:00
Don Mitchell
1c6e00572a Merge pull request #1137 from edx/dhm/pr271_fixups 
old pr 271 comment fixups
 2013-09-27 14:19:25 -07:00
Vik Paruchuri
c11f708d0f Merge pull request #1080 from edx/fix/vik/oe-problems 
Clean up open ended problems view and fix error.
 2013-09-27 14:12:15 -07:00
Vik Paruchuri
19fb2017be Streamline and test uploading ... remove requirement that uploads be images, can now upload any file. 2013-09-27 17:08:34 -04:00
Don Mitchell
d79220122c Change DescriptionLocator to DefinitionLocator 2013-09-27 16:27:02 -04:00
Calen Pennington
37627704dc Merge pull request #1117 from cpennington/manage.py-only-tests 
Move nose arguments around so that we can run tests with manage.py
 2013-09-27 13:13:03 -07:00
Don Mitchell
f8c7278470 Follow patterns 
Move init to top of class
Change asserts to more meaningful exception types
Refactor hard-to-read fn
 2013-09-27 16:03:57 -04:00
Vik Paruchuri
9a6ae8f740 Clean up open ended problems view and fix error. 2013-09-27 16:02:12 -04:00
e0d
759a853464 Merge pull request #1063 from edx/e0d/django-1.4.8 
Upgrading to 1.4.8
 2013-09-27 12:54:44 -07:00
Usman Khalid
bc56ab7c13 Merge pull request #1057 from edx/usman/lms-1114-pdf-arrows 
Disables the previous/next arrows on pdf books on the first/last pages
 2013-09-27 12:50:38 -07:00
Calen Pennington
67ccf1e3bb Move nose/django arguments for tests out of rake so that raw manage.py works when running tests 2013-09-27 15:41:58 -04:00
Usman Khalid
316b4eee95 Merge pull request #1073 from edx/usman/lms1026-find-courses-link-optional 
Added setting to disable 'find courses' links
 2013-09-27 12:40:07 -07:00
Usman Khalid
64d4ebdaa1 Revert last commit 2013-09-28 00:14:07 +05:00
brianhw
8d7b40f456 Merge pull request #1160 from edx/brian/fix-extauth-courseware-import 
Move Pearson courseware imports to function level.
 2013-09-27 11:40:48 -07:00
Giulio Gratta
abfb33c3e5 Merge pull request #1158 from edx/giulio/small-oe-fixes 
An assortment of small OE changes, both for ICE and standard
 2013-09-27 11:29:26 -07:00
Giulio Gratta
d75cdda064 An assortment of small OE changes, both for ICE and standard 
- Changed save OE message text
- Fix ICE legend positioning and content
- Add space to "offensive" checkbox
- Change tracker variable in undo to correct one
 2013-09-27 11:29:06 -07:00
Calen Pennington
eebc524cde Merge pull request #909 from cpennington/xmodule-mixin 
Pull XModule attributes out into a mixin that can be applied to xblocks
 2013-09-27 10:49:13 -07:00
jkarni
f27af194bc Merge pull request #1056 from edx/jkarni/feature/update-preview-reqs 
Adding Pillow jpeg and tiff system libs
 2013-09-27 10:37:29 -07:00
Calen Pennington
d77491e46a Pull XModule attributes out into a mixin that can be applied to xblocks 2013-09-27 13:11:05 -04:00
Jay Zoldak
d2516b6869 Merge pull request #1142 from edx/zoldak/update-discussion-doc 
update discussion forum doc
 2013-09-27 10:06:00 -07:00
Brian Wilson
07f94d46a6 Move Pearson courseware imports to function level. 2013-09-27 12:43:27 -04:00
Usman Khalid
59403644ae Moved jquery event handling to parent since hidden elements do not get events attached 2013-09-27 21:35:16 +05:00
Calen Pennington
f4dd50826a Merge pull request #1055 from cpennington/cleanup-xml-hotfix 
Clean up after hotfix to fix xml loading for import
 2013-09-27 09:24:22 -07:00
jmclaus
4a9d1928d4 Merge pull request #1154 from edx/valera/fix_failing_jasmine_test_return_correct_caption_index 
Fix for PR 1119.
 2013-09-27 09:17:56 -07:00
Usman Khalid
5ca778ef05 Display:none arrows in disabled state 2013-09-27 21:06:34 +05:00
Valera Rozuvan
36fc1a6243 Fix for PR 1119. 
A Jasmine test was falling. It went unnoticed. The PR was merged. This
is a fix for it.
 2013-09-27 18:43:58 +03:00
jmclaus
cb56b7b9fd Merge pull request #1119 from cheng-shiwen/cheng-shiwen/master 
caption display problem
 2013-09-27 08:03:00 -07:00
Calen Pennington
f500b72290 Make sure that we have the right set of fields available during xml parsing 
We had a bug where mixins weren't being applied before `load_from_xml`
was called. This meant that not all of the fields were being loaded
correctly. To fix it, we used the mixoligist from the runtime to apply
the mixins earlier in the process. However, that caused the mixins to be
applied twice.

The included fixes to xblock resolved the multiply-applied mixins, and
the fixes to the parsing code make it simpler to understand, and add
some unit tests of the parsing to boot.
 2013-09-27 10:57:39 -04:00
Calen Pennington
813795ddf4 Add a management command to dump xml courses 
This command loads the courses with the XMLModuleStore, and then exports
the fields contents as json in a diff-friendly way. This can then be
used to validate against regressions in the xml parsing code.
 2013-09-27 10:57:39 -04:00
Shiwen Cheng
522cb8b48c fix the video caption lag issue 2013-09-27 22:41:36 +08:00
Shiwen Cheng
77f3e4f964 fix the bug: when click a caption, the previous one will be in bold 2013-09-27 22:41:35 +08:00
Shiwen Cheng
21a9446b99 fix the bug that the first caption and the second one will become current at the same time when displaying right captions 2013-09-27 22:41:35 +08:00