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

21404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alison Hodges
406a91f548 Added change log entry 2014-02-24 09:56:21 -05:00
Alison Hodges
61a05ab877 Corrected and completed the wiki data chapter 2014-02-24 09:36:34 -05:00
Alison Hodges
9dae955377 Formatting fix for Comments 2014-02-24 09:26:39 -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
Mark Hoeber
05bccadfd8 Merge pull request #2684 from edx/sylvia/documentation/BLD-849 
Sylvia/documentation/bld 849
 2014-02-22 10:13:25 -05:00
Sylvia Pearce
1cb0cb209d Quick typo fix 2014-02-21 18:03:47 -05:00
Sylvia Pearce
eb6b8aa26f Add XML information from Appendix E to Common and Advanced Problems 2014-02-21 18:03:02 -05: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
Mark Hoeber
10d1ea11e9 Merge pull request #2673 from edx/ahodges/documentation/betatesting2 
Ahodges/documentation/betatesting2
 2014-02-21 16:34:23 -05:00
Alison Hodges
c5124cc7cc Edits from Ruth, change log & index updates 2014-02-21 16:33:16 -05:00
Alison Hodges
cfcc0e272f More edits from Sarina, results of testing 
acct activation required; discussion and wiki posts. Added
cross-reference and info on executing tests when viewing a live course
 2014-02-21 16:31:25 -05:00
Mark Hoeber
351407c81a Merge pull request #2679 from edx/ahodges/documentation/discussiondata 
Ahodges/documentation/discussiondata
 2014-02-21 16:28:50 -05:00
Alison Hodges
5ff5cd2019 Documentation updates to add missing fields and verify descriptions of existing fields for discussion data 2014-02-21 16:27:56 -05:00
Jay Zoldak
a620cc0004 Merge branch 'release' 
Conflicts:
	lms/templates/courseware/accordion.html
 2014-02-21 16:17:02 -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
Jay Zoldak
12fe2701aa Merge pull request #2676 from edx/jbau/timezone-hotfix 
Use new setting for LMS deadline display instead TIME_ZONE
 2014-02-21 14:07:39 -05:00
Jason Bau
183d9bbb93 Use new setting for LMS deadline display instead TIME_ZONE 2014-02-21 10:20:06 -08:00
Carson Gee
082f20db60 Remove SSL Certifcate auth reliance on internal password 2014-02-21 12:19:59 -05:00
Valera Rozuvan
298570361e Merge pull request #2618 from edx/valera/fix_multiple_choice_video 
Fix bug multiple choice with video. BLD-788.
 2014-02-21 16:23:13 +02: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
David Baumgold
1bf5d7120c Merge pull request #2662 from edx/db/textbook-id-unicode 
Call unicode() instead of str() for textbook IDs
 2014-02-20 17:18:23 -05:00
Sylvia Pearce
ec168432c3 Adding XML into to individual problem types 2014-02-20 17:02:31 -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
Jay Zoldak
4c21270f2e Merge branch 'release' 2014-02-20 16:29:06 -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
Jay Zoldak
377ece3e1c Merge pull request #2661 from edx/zoldak/disable-new-test 
Disable course listing perf test
 2014-02-20 16:04:45 -05:00
David Baumgold
33f56e1bba Call unicode() instead of str() for textbook IDs 
STUD-1327
 2014-02-20 14:58:17 -05:00
Jay Zoldak
3f4571ddd9 Disable course listing perf test 2014-02-20 14:43:11 -05:00
Jim Abramson
0d28e2bfe0 Merge pull request #2607 from edx/jsa/forum-test-delete-comment 
django_comment_client: add unit test for (sub)comment deletion.
 2014-02-20 13:38:21 -05:00
jsa
4c5336e809 django_comment_client: add unit test for (sub)comment deletion. 
JIRA: FOR-470
 2014-02-20 13:35:26 -05:00
Mark Hoeber
a6184c9113 Merge pull request #2641 from edx/markhoeber/documentation/release-notes-2-19-14 
Markhoeber/documentation/release notes 2 19 14
 2014-02-20 13:23:23 -05:00
jsa
7d32a90ae2 add ability to delete comments on responses in discussions. 2014-02-20 13:14:11 -05:00
Carson Gee
eecb7fab8b Merge pull request #2535 from edx/fix/ichuang/STUDENT_FILEUPLOAD_MAX_SIZE 
allow STUDENT_FILEUPLOAD_MAX_SIZE to be configured in aws.py
 2014-02-20 11:51:40 -05:00
Mark Hoeber
7802514417 Merge pull request #2625 from edx/markhoeber/documentation/stud-1211 
Grading chapter enhancements
 2014-02-20 11:33:42 -05:00
Mark Hoeber
6fbf830837 Grading chapter enhancements 
STUD-1211
 2014-02-20 11:32:05 -05:00
Mark Hoeber
55e92521c1 Merge pull request #2645 from edx/markhoeber/documentation/stud-1316 
Markhoeber/documentation/stud 1316
 2014-02-20 11:20:06 -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
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
Mark Hoeber
d29e93b7fa added STUD-235 2014-02-20 10:22:22 -05:00
zubiar-arbi
88690dab1d resolve conflict on rebase 2014-02-20 20:21:52 +05:00
Adam
d7b63da6d8 Merge pull request #2642 from edx/adam/i18n-self-assessment-3 
Adam/i18n self assessment 3
 2014-02-19 16:47:49 -05:00
Jay Zoldak
9986a664bb Merge pull request #2650 from edx/zoldak/dbt-onto-release 
Rollback Django Debug Toolbar from 1.0.1 to 0.9.4
 2014-02-19 15:46:35 -05:00
Adam Palay
f1984e7a9f i18n open_ended_rubric (ORA-314) 
update strings
 2014-02-19 15:41:16 -05:00