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

9654 Commits

Author SHA1 Message Date
jsa
7be356b390 auto_auth: add ability to configure forum roles and scrape user id. 2014-02-26 10:30:55 -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
Greg Price
c3dc40d729 Add UI for editing forum third-level content 2014-02-26 10:00:50 -05:00
Waheed Ahmed
cb4d3dd327 Merge pull request #2671 from edx/waheed/lms1479-front-end-validation-for-username-email 
Added validation for username and email max length.
 2014-02-26 19:42:04 +05:00
Alexander Kryklia
2e78fce760 Allow /static in transcript names. 2014-02-26 15:48:28 +02:00
zubair-arbi
458943c881 Merge pull request #2364 from edx/zub/bugfix/std1140-seedforumpermissions 
assign default role 'Student' to user on recreating course
 2014-02-26 17:50:28 +05:00
Waheed Ahmed
874d7360c1 Added validation for username and email max length. 
LMS-1479
 2014-02-26 16:25:37 +05:00
Valera Rozuvan
f8e8a9a34a Addressing review comments from jmclaus. 2014-02-26 13:14:10 +02:00
zubiar-arbi
cf47b6b670 assign default forum role 'Student' to user on course recreate with same name STUD-1140 
STUD-1140
 2014-02-26 15:40:44 +05: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
c72d410083 Remove doc-ready tests, which were flaky 2014-02-25 14:01:37 -05:00
Calen Pennington
ae34c3fe9f Mark xblock initialization status using css class (in part to make testing easier) 2014-02-25 14:01:37 -05:00
Calen Pennington
35fbc15edb Add tests of more scopes in student_view 2014-02-25 14:01:37 -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
Chris Dodge
fe3ebca1c5 add new feature to make sure we aren't writing PII into the application logs. So far we're aware of doing so regarding Auth use-cases 2014-02-25 00:14:19 -05: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
Greg Price
3f48e22448 Fix strings to avoid dangling commas 2014-02-24 14:46:41 -05: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
Jay Zoldak
e4b6fe2c68 Merge pull request #2695 from edx/will/revert-paver-again 
Revert "Fix sys.path manipulation in pavement.py, with detailed comment"
 2014-02-24 11:31:26 -05:00
Will Daly
812e71bbbb Revert "Fix sys.path manipulation in pavement.py, with detailed comment" 
This reverts commit 544616be4b.
 2014-02-24 11:30:40 -05:00
Adam Palay
2e58e80a68 minor change to html in announcement unit (STUD-1334) 2014-02-24 10:34:44 -05:00
Ned Batchelder
b21473f976 Make fake_ugettext et al more usable elsewhere. 2014-02-24 10:06:13 -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
Will Daly
38d403f6c9 Merge pull request #2615 from edx/will/paver-attempt-2 
Paver (Part 1) -- Attempt 2
 2014-02-24 07:51:05 -05:00
Jim Abramson
e3a71b1625 Merge pull request #2646 from edx/jsa/forum-delete-comments 
add ability to delete comments on responses in discussions.
 2014-02-22 19:14:59 -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
Carson Gee
2da1e4ee26 Merge pull request #2674 from carsongee/cg/ssl_remove_password 
Remove SSL Certifcate auth reliance on internal password
 2014-02-21 17:04:55 -05: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
Carson Gee
3303fb120b Review fixes 2014-02-21 16:01:01 -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
Calen Pennington
3093efc889 Make bok-choy correctly publish units with children 2014-02-21 15:00:32 -05:00
Carson Gee
082f20db60 Remove SSL Certifcate auth reliance on internal password 2014-02-21 12:19:59 -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
ichuang
79650f5538 add infinity symbol to calc preview 2014-02-20 21:06:54 -05:00
Will Daly
92d4726b63 Merge pull request #2639 from edx/will/bok-choy-test-robustness 
Will/bok choy test robustness
 2014-02-20 16:59:30 -05:00
Will Daly
defbd87468 Protect Acid XBlock test from stale element or zero-length locator list 2014-02-20 16:19:43 -05:00
jsa
7d32a90ae2 add ability to delete comments on responses in discussions. 2014-02-20 13:14:11 -05: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