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

7141 Commits

Author SHA1 Message Date
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
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
E. Kolpakov
75d61b6fa2 Renamed course_key to structure_key to reflect the fact it might be a library key as well. 2015-04-14 14:43:37 +03:00
E. Kolpakov
9bbad95497 Moved library key normalization into library_tools module, fixed library update task test 2015-04-14 14:43:37 +03:00
E. Kolpakov
77cc80f6b6 Added code to fire library_updated signal when library is updated 2015-04-14 12:41:24 +03:00
E. Kolpakov
bd891c21db Added setting to enable/disable library indexing + moved is_index_enabled into search indexer classes 
Added task and signal to fire library reindex
 2015-04-14 12:40:05 +03:00
E. Kolpakov
d34c6a0783 Filtering using search index + tests 2015-04-14 12:32:50 +03:00
E. Kolpakov
2f03b97636 Index dictionary for CapaDescriptor + extending tests to cover it 2015-04-14 12:32:49 +03:00
Christopher Lee
9bf8ae5b52 Merge pull request #7635 from edx/clee/MA-318 
MA-318, change edx video id to video id
 2015-04-13 14:55:56 -04:00
Matt Drayer
97f0cf108f Merge pull request #7577 from edx/mattdrayer/SOL-464 
Add course-specific URL overrides for social sharing icons on student da...
 2015-04-13 14:42:15 -04:00
christopher lee
c42097b458 MA-318, change edx video id to video id 2015-04-13 13:31:37 -04:00
Matt Drayer
ffe30da7a5 Add course-specific URL overrides for social sharing icons on student dashboard 
- sharing enabled for custom URLs only if URL actually specified
 2015-04-13 13:14:43 -04:00
Martyn James
e1be8a526a Merge pull request #7655 from edx/dcikatic/SOL-570 
SOL-570 Remove djangotracker from common imports - merging
 2015-04-13 12:43:02 -04:00
Dino Cikatic
0fa86e3d5c SOL-570 Remove djangotracker from common imports 2015-04-13 11:58:37 -04:00
applecool
c4cdfe210f Fix for TNL-1639 2015-04-13 11:41:07 -04:00
Syed Hassan Raza
08c6752722 Revert hotfix for PLAT-452 2015-04-13 20:20:19 +05:00
David Ormsbee
03c3bbb379 Merge pull request #6636 from jazkarta/feature-pocs 
MIT CCx (was Personal Online Courses)
 2015-04-11 11:15:43 -04:00
Carlos de la Guardia
f9351ef830 MIT: CCX. Code Quality Fixes 
Remove duplicated course listings template code on the student dashboard.
 2015-04-10 23:30:27 -04:00
cewing
8ba74429b1 MIT: CCX. Fixes for API changes that affect the binding of descriptors to student context. 
fix for making sure all descriptor fields are always available for course descriptors despite module_class tricks

add required fields to cache data for tests

use a different strategy to mock up the get_children method
 2015-04-10 23:30:27 -04:00