Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,207 Commits 1 Branch 0 Tags
5cef287c5dfb2db7aa90ff0478587f1f12e505fd
Commit Graph

7158 Commits

Author SHA1 Message Date
Diana Huang
ac8b75ca7f Merge pull request #7804 from edx/diana/progress-summary-refactor 
Implement the Weighted Problem Grade Report
 2015-05-13 09:10:02 -04:00
Daniel Friedman
3acd7a008c Refactor and add tests for new grade report. 
* Handle grading errors
 2015-05-13 06:58:02 -04:00
Diana Huang
7df9ab9c14 Extend the Score namedtuple to know about module locations. 2015-05-12 16:32:00 -04:00
Calen Pennington
1eb040f4ff Add MetricsMixin back into DescriptorSystem and ModuleSystem 2015-05-12 10:23:31 -04:00
Adam Palay
8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master 
Conflicts:
	common/test/acceptance/tests/video/test_video_times.py
 2015-05-08 10:23:04 -04:00
Shrhawk
7b53584653 Merge pull request #7621 from edx/shr/bug/TNL-1858-Unable-to-delete-studio-page 
Delete static_tab for split courses raises 500 error
 2015-05-08 15:06:03 +05:00
Syed Hassan Raza
e7aeb92182 update the attrib using dict-->update() function 2015-05-07 14:05:27 -04:00
Adam Palay
afec81b662 prevent overly nesting _field_data (TNL-2050) 2015-05-07 14:05:27 -04:00
Syed Hassan Raza
b7955fab77 Static tab as orphan 2015-05-06 16:18:14 +05:00
Feanil Patel
aa6565959d Merge branch 'release' 
Conflict in import because someone had added an import in master that
was not in the release.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py
 2015-05-05 16:27:45 -04:00
Calen Pennington
73bbb89297 Merge pull request #7839 from cpennington/fix-plat-541 
Move entry_point down into XModule/XModuleDescriptor so that 'xmodule.v1...
 2015-05-05 11:08:08 -04:00
Shrhawk
d60b4eed13 Merge pull request #7871 from edx/shr/bug/TNL-2094-6.00.x-export-issue 
update the attrib using dict-->update() function
 2015-05-05 12:08:29 +05:00
John Eskew
8ca57f83d3 Separate draft/published import into two separate bulk operations. 
Add import_drafts abstract method in addition to import_children.
 2015-05-04 14:54:54 -04:00
John Eskew
b290b305df Reorganize code, change method name, & fix comments. 
Change xml file reading code when importing a course.
 2015-05-04 14:54:50 -04:00
John Eskew
1c6ab4cc6a Add has_changes check for draft modules before exporting them. 
Only export draft modules that have changes w.r.t. the published branch
should be exported to the /drafts directory in the course export.
 2015-05-04 14:54:12 -04:00
John Eskew
062ad95f79 Change str to repr and change formatting. 2015-05-04 14:54:11 -04:00
John Eskew
61aa3c2789 If BlockKey already, then return. 2015-05-04 14:54:11 -04:00
John Eskew
45ad00ae38 Add tests for more draft/published import/export. 
Include tests that mimic behavior in PLAT-452.
 2015-05-04 14:54:11 -04:00
John Eskew
c21cf66569 Only include published items in course export. 2015-05-04 14:54:11 -04:00
Syed Hassan Raza
1175047d12 update the attrib using dict-->update() function 2015-05-04 21:07:40 +05:00
Awais Jibran
1ec7dc813f Merge pull request #7797 from edx/aj/tnl2008-stop-video-event-not-emitted-correctly 
Videos should emit `stop_video` event once the video segment is compelte...
 2015-05-04 12:08:45 +05:00
Ahsan Ulhaq
918afe64fd Numerical Input assessment has multiple accessibilty issues 
TNL-1677
 2015-05-01 23:15:33 +05:00
E. Kolpakov
6db974c8ee Fixes for course import-export: 
* Updated XBlock hash - new version forces exposes force_dirty method on fields
* Includes Scope.children fields into xml_importer._update_module_location so that they are updated as well.
* Tests for mutable fields xml_importer._update_module_location with mutable fields and children
 2015-05-01 18:36:14 +03:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04:00
Daniel Friedman
9e90ec5c0a Correct "shure" to "sure" in a comment 2015-04-29 16:05:43 +00:00
David Baumgold
28c898c395 Correct spelling in a comment 2015-04-29 11:27:07 -04:00
Adam Palay
41a66b521b fix typo in captions js (TNL-2076) 2015-04-29 11:02:26 -04:00
Calen Pennington
a1c0773c4d Move entry_point down into XModule/XModuleDescriptor so that 'xmodule.v1' only applies to XModules, not pure XBlocks with the XModuleMixin 2015-04-28 15:33:04 -04:00
Chris
d9e13d22b8 Merge pull request #7763 from edx/clrux/sequence-nav-button-icons 
Changing sequence nav buttons from images to icon fonts
 2015-04-28 14:05:38 -04:00
Chris Rodriguez
74ce5cbb87 Changing sequence nav buttons from images to icon fonts 2015-04-28 11:04:16 -04:00
Mark Hoeber
356b10c271 Update component templates for accessibility and content 2015-04-27 14:45:36 -04:00
Waqas Khalid
97e6091bd7 Tab number in url doesn't take to correct tab 
When there is multiple units in a particular subsection
then there will be tabs in courseware. When url have
tab number at the end of the url the code was not
considering it and showing the wrong tab. I have changed
such that it will always check the value of position.

TNL-1844
 2015-04-24 17:50:32 +05:00
Awais Jibran
8e5a63c440 Videos should emit stop_video event once the video segment is compelte. 
TNL-2008
 2015-04-24 10:48:13 +05:00
Sarina Canelake
8006227aa6 Merge pull request #7667 from applecool/L10N_bugfix 
Fix to LOC-66
 2015-04-23 10:48:15 -04:00
applecool
3f11df3f34 Fix to LOC-66 2015-04-22 20:45:44 -05:00
Chris Rodriguez
b9a30b226e RTL-ifies the sequence nav buttons 2015-04-22 09:52:12 -04:00
Nimisha Asthagiri
c2a1870fb5 Clean ID of course_module for push notification channel name. 
Update Mobile API to include channel_id for course.
 2015-04-18 15:30:19 -04:00
Calen Pennington
f67cb76fb4 Merge pull request #7686 from cpennington/xmodule-metrics-sample-rate 
Sample xblock metrics at 10%
 2015-04-17 13:52:05 -04:00
Chris
4a27e8b6cc Merge pull request #7711 from edx/clrux/UX-1946-div-focus-fix 
Adding outline styles (none) to the sr focus div
 2015-04-17 12:44:27 -04:00
Eugeny Kolpakov
b1765d0a69 Merge pull request #7641 from open-craft/eugeny/problem-type-search 
Capa problem type filtering using edx-search
 2015-04-17 18:43:04 +03:00
Chris Rodriguez
2637ac897d Changing id to class 2015-04-17 08:55:30 -04:00
David Baumgold
1c910023aa Merge pull request #7111 from ataki/ataki/upstream-pr-video-start-stop 
hard start/stop times to video player
 2015-04-15 16:42:24 -04:00
ataki
2c6226362e Warning that hard start/stop times don't work for mobile 2015-04-15 14:47:42 -04:00
Sarina Canelake
07b7c5c83a Merge pull request #7663 from applecool/edxsprint 
Fix for TNL-1639
 2015-04-14 19:40:52 -04:00
ataki
5f5a77acb1 Add comment, refactor, handle edge cases 2015-04-14 15:56:56 -04:00
ataki
27d3d0344d Update variable names for video module 2015-04-14 15:56:56 -04:00
ataki
5917ed063d hard start/stop times to video player 
This pull request makes the video player module respect
the video start/stop times specified by the instructor
as a hard start/stops, i.e. the video treats the start
time as the beginning of the video and the stop time as
the end.

Previously, the video module displayed the full
video and displayed a jquery ui slider range representing
the start and end times.

This new functionality invalidates two previous acceptance
tests for the video module:

    - slider visible test
    - finish time video acceptance test.

These tests are removed from the common acceptance tests.
 2015-04-14 15:56:56 -04:00
Calen Pennington
d9630c7c76 Sample xblock metrics at 10% 2015-04-14 13:46:32 -04:00
Adam
d3bb72251e Merge pull request #7683 from edx/release 
Release
 2015-04-14 11:45:12 -04:00