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

5571 Commits

Author SHA1 Message Date
Gabe Mulley
94fea8e822 Add map to problem_check event with descriptions of student answers 
The map contains a human readable description of the answer if
necessary. It is useful for problem like multiple choice, when the
response of the student is replaced by a moniker. For example "choice_0"
instead of the full text.

Fixes: AN-587
 2014-03-02 21:40:45 -05:00
Dave St.Germain
a1dc347c1a Merge pull request #2767 from edx/dcs/a11y-forgot-a-label 
Add label to the checkboxes sample template.
 2014-02-28 14:19:16 -05:00
chrisndodge
38916f8528 Merge pull request #2713 from edx/cdodge/add-auth-to-wiki 
add some authorization checks to the Wiki
 2014-02-28 14:15:59 -05:00
Chris Dodge
10465e3eb0 add some authorization checks to the Wiki 2014-02-28 13:36:18 -05:00
Dave St.Germain
fd59de346b Converted javascript confirmation dialog to jquery UI dialog (needs style) 2014-02-28 13:32:39 -05:00
Dave St.Germain
9826a2f19e Add label to the checkboxes sample template. 2014-02-28 11:25:42 -05:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release' 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-02-27 17:33:40 -05:00
Calen Pennington
9d850eec2d Fix case where both old and new transcripts are uploaded, but transcript language isn't one of the new transcripts. 2014-02-27 15:42:19 -05:00
Calen Pennington
287d84ba95 Fix youtube captions that disappeared with multi-language caption support 
[BLD-889]
 2014-02-27 15:42:19 -05:00
Waheed Ahmed
4db7885336 Students not receiving credit for peer assessment. 
ORA-330
 2014-02-27 10:38:34 -05:00
Valera Rozuvan
074e947ef7 Merge pull request #2690 from edx/valera/add_start_time_end_time_functionality 
Fix start-time functionality in the video player.
 2014-02-27 00:16:10 +02:00
Ned Batchelder
1fb5c3cc82 Merge pull request #2708 from pdehaye/patch-1 
The correct LTI keyword is "roles", not "role"
 2014-02-26 12:57:34 -05:00
zubair-arbi
2cb3cc3621 Merge pull request #2238 from zubair-arbi/zub/bugfix/std154-courseinfohtml 
update course info module to save content without modifying
 2014-02-26 21:34:10 +05:00
Alexander Kryklia
331a94c124 Allow /static in transcript names. 2014-02-26 10:05:34 -05:00
Alexander Kryklia
4d7ef488e7 Fix typo in video_module. 2014-02-26 10:05:04 -05:00
Alexander Kryklia
9ffcbb88b5 Merge pull request #2728 from edx/alex/allow_static_in_transcript_names 
Allow /static in transcript names.
 2014-02-26 17:01:39 +02:00
Alexander Kryklia
2e78fce760 Allow /static in transcript names. 2014-02-26 15:48:28 +02:00
Valera Rozuvan
f8e8a9a34a Addressing review comments from jmclaus. 2014-02-26 13:14:10 +02:00
Alexander Kryklia
d6602f4f74 Fix typo in video_module. 2014-02-26 12:39:44 +02:00
Valera Rozuvan
91ec617cf7 Addressing review comments from jmclaus. 2014-02-26 11:29:51 +02:00
Valera Rozuvan
c667c013e7 Fix start-time functionality in the video player. 
When there is a start-time:

Initially, the video starts playing from the start-time.
Whenever the player resets for any reason (such as reaching
the end of the video), it will reset to start-time instead of 00:00:00.
It should not be the case that any time the user presses play, it
start playing from start-time.

BLD-659.
 2014-02-26 11:24:14 +02:00
zubiar-arbi
cfa6b14575 update course info module to save content in new 'items' field + update import/export to handle content field other than 'data' or 'metadata' 
STUD-154
 2014-02-26 13:11:59 +05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test 
Add tests of local_resource_url
 2014-02-25 16:46:10 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Giulio Gratta
35112e9e78 Variable-ize "Certificate of Achievement" text 2014-02-25 10:19:03 -08:00
pdehaye
d51e18f6d2 The correct LTI keyword is "roles", not "role" 
This is only a correction in the documentation
 2014-02-25 00:57:48 +01:00
Adam
c9a4de607d Merge pull request #2694 from edx/adam/announcement-text 
minor change to html in announcement unit (STUD-1334)
 2014-02-24 15:55:14 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00
Don Mitchell
0b262e7cea Merge pull request #2660 from edx/dbarch/parse_course_id 
Dbarch/parse course
 2014-02-24 13:24:00 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
Adam Palay
2e58e80a68 minor change to html in announcement unit (STUD-1334) 2014-02-24 10:34:44 -05:00
Ned Batchelder
6bb0eee3c6 Make the i18n service available everywhere. 
To get all dates localized, we need all runtimes to have the i18n
service, and since runtimes are made by the modulestores, we need to
pass it to them.

Soon (fingers crossed), modulestores won't be involved in making
runtimes, and many of these changes will go away.
 2014-02-24 10:06:13 -05:00
Valera Rozuvan
e0aa30f06f Merge pull request #2616 from edx/valera/convert_time_to_js 
Converting Time module to JS.
 2014-02-22 20:41:39 +02:00
Calen Pennington
39563c327c Make staff view work w/ pure xblocks (that only have a descriptor system) 2014-02-21 16:47:19 -05:00
Calen Pennington
9b54e44be8 Merge pull request #2602 from cpennington/xblock-acid-child-tests 
Add tests of the frontend children api using the AcidXBlock
 2014-02-21 16:07:23 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform 
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
 2014-02-21 15:01:20 -05:00
Valera Rozuvan
1107aa2b7f Fix bug multiple choice with video. BLD-788. 
The Video element contains an input with type file. When the
Check button was clicked for the multiple choice problem, the
code was acting in different ways when there as a Video on the
page and when there wasn't. This is because in the check_fd()
method there was a selector that was looking for inputs of type
file on the whole page instead of just in the current problem.
When there was a Video pn the page, the page-wide selector
returned the Video's file input, and the check_fd() method
went on believing that the multiple choice has a file input.

The correct way is to look for file inputs only in the current
element.

Added a Jasmine JavaScript unit test.

BLD-788.
 2014-02-21 08:48:43 +00:00
Valera Rozuvan
2dbc5a4115 Converting Time module to JS. 2014-02-21 08:37:38 +00:00
zubair-arbi
603f36959d Merge pull request #2423 from edx/zub/story/std1133-studioedgelogin 
try to get courses by django groups for non global users
 2014-02-20 21:18:05 +05:00
zubiar-arbi
6892bc73b2 get courses by reversing django groups for non global users (studio dashboard) 
STUD-1133
 2014-02-20 20:23:12 +05:00
Don Mitchell
2057f5185c Merge pull request #2631 from edx/dbarch/xml_ms_filter 
Have xml modulestore only load course in course_ids if provided
 2014-02-20 10:22:39 -05:00
Don Mitchell
24bc33a882 Have xml modulestore only load course in course_ids if provided 2014-02-19 12:05:38 -05:00
David Baumgold
549fbe4815 Rollback Django Debug Toolbar from 1.0.1 to 0.9.4 
Due to issues with require.js and the latest version of the toolbar.
Also included a note in the requirements file explaining the situation, and what
needs to happen before this can be upgrade properly.
 2014-02-19 11:41:12 -05:00
Ned Batchelder
3aff96c2e4 Add strftime to the i18n runtime service. 2014-02-18 17:35:56 -05:00
Ned Batchelder
229f3522fa Move date_utils to common/djangoapps/util 2014-02-18 17:35:56 -05:00
Dave St.Germain
3d08bfd208 Fixes devstack settings to work with new version of debug toolbar 2014-02-18 14:50:36 -05:00
Adam
7b3376f944 Merge pull request #2575 from edx/adam/i18n-self-assessment-2 
Adam/i18n self assessment 2
 2014-02-18 09:07:24 -05:00
Alexander Kryklia
23a2177da3 Enable download_track for existing courses if self.track. 2014-02-18 12:31:06 +02:00
Adam Palay
97f5b25e2c i18n for self-assessment (ORA-314) 
make openendedchild and open_ended_module_v1 act enough like xblocks to get xblock 18n
 2014-02-14 17:27:32 -05:00
Julia Hansbrough
48383de870 Merge pull request #2606 from edx/release 
Hotfix for Feb 14 2012
 2014-02-14 14:18:38 -05:00