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

447 Commits

Author SHA1 Message Date
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Alison Hodges
fbe95bfb5b Merge pull request #2980 from edx/ahodges/documentation/prettyprint 
Added pretty-printed JSON examples for DOC-168, fixed rst subheadings
 2014-03-19 14:45:47 -04:00
Alison Hodges
4f917a8914 Added pretty-printed JSON examples for DOC-168, fixed rst subheadings 2014-03-19 14:44:52 -04:00
Alison Hodges
0752b008bb Merge pull request #2976 from edx/ahodges/documentation/hackathon 
Instructor dash changes for DOC-231, resequencing for DOC-230
 2014-03-19 11:03:55 -04:00
Alison Hodges
ba67e59ead Instructor dash changes for DOC-231, resequencing for DOC-230, and fixed display of notes 2014-03-19 11:02:55 -04:00
Mark Hoeber
a9164f168b edits 2014-03-18 13:49:53 -04:00
Mark Hoeber
958c52602f edits 2014-03-18 10:20:06 -04:00
Mark Hoeber
04d51bdda5 edits 2014-03-18 09:55:13 -04:00
Mark Hoeber
d13c81f055 edits 2014-03-18 09:44:06 -04:00
Mark Hoeber
f4eb88bb11 edits 2014-03-17 17:59:38 -04:00
Mark Hoeber
fec421caf2 Release Notes for 3-18-14 
Doc-195
 2014-03-17 17:47:00 -04:00
Mark Hoeber
a795edcf22 Merge pull request #2666 from pdehaye/patch-2 
further explanation on entry_points
 2014-03-17 17:11:02 -04:00
Mark Hoeber
8100e38f3f edX Course Authors Doc Reorganization 2014-03-17 11:43:32 -04:00
Mark Hoeber
16523b9912 Merge pull request #2947 from edx/markhoeber/documentation/doc-34 
Edits from Alison's initial review
 2014-03-14 15:52:33 -04:00
Mark Hoeber
bb85698450 Edits from Alison's initial review 
DOC-34
 2014-03-14 15:02:35 -04:00
srpearce
f666b8542c Merge pull request #2943 from edx/sylvia/documentation/BLD-850 
Consolidate information from data.edx.org, Appendix E, and problem types
 2014-03-14 14:37:19 -04:00
Sylvia Pearce
6c20d1bace Consolidate information from data.edx.org, Appendix E, and problem types 2014-03-14 09:41:10 -04:00
David Baumgold
73d0d093f9 Merge pull request #2654 from pdehaye/patch-1 
missed rst
 2014-03-13 16:34:18 -04:00
Alison Hodges
2218764e94 Merge pull request #2930 from edx/ahodges/documentation/updateindex 
Added internal refs to help researchers find the data format files
 2014-03-13 11:25:16 -04:00
Alison Hodges
d65a216d69 Added internal refs to help researchers find the data format files 2014-03-13 11:24:11 -04:00
Alison Hodges
32d6eed2c4 Merge pull request #2795 from edx/ahodges/documentation/studentdata 
Ahodges/documentation/studentdata
 2014-03-13 09:34:27 -04:00
Alison Hodges
a5cc790835 Updates and corrections for DOC-169 2014-03-13 09:32:44 -04:00
Mark Hoeber
5629c7ac93 Merge pull request #2897 from edx/markhoeber/documentation/release-notes-3-11-14 
Release notes 3-11-14  Doc-73
 2014-03-12 14:44:56 -04:00
Mark Hoeber
648422f966 Release notes 3-11-14 
DOC-73
 2014-03-12 14:44:10 -04:00
Sylvia Pearce
11aa95cefb Update video doc to reflect new LMS **Download transcript** button 2014-03-12 13:22:04 -04:00
Mark Hoeber
1670078c29 Merge pull request #2862 from edx/markhoeber/documentation/stud-1272 
Course Image and Dates documentation changes
 2014-03-11 10:52:22 -04:00
Mark Hoeber
599183f8c6 Course Image and Dates documentation changes 
stud-1272
 2014-03-11 10:51:44 -04:00
Sarina Canelake
e7bc771bb7 Update discussions documentation LMS-2092 2014-03-07 10:22:45 -05:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved 
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
 2014-03-06 16:56:16 -05:00
Mark Hoeber
f89396fae8 Merge pull request #2799 from edx/markhoeber/documentation/release-notes-3-4-14 
First Draft release notes 3-3-14
 2014-03-06 14:02:11 -05:00
Mark Hoeber
dd19ac64e1 External URL change in Files & Upoads 
STUD-1314
 2014-03-06 12:58:26 -05:00
Mark Hoeber
72f127de55 Release notes 3-3-14 
DOC-72
 2014-03-06 12:44:37 -05:00
Alison Hodges
a5d9ed5b04 Merge pull request #2821 from edx/ahodges/documentation/problemcheck 
Added changes for AN-609
 2014-03-05 16:36:19 -05:00
Alison Hodges
293f62a740 Added changes for AN-609 
changes to problem_check to support answer distribution; also provided
an example and nav in the introduction
 2014-03-05 16:28:04 -05:00
Alison Hodges
68d4248a0e Converted 104 existing gif files to png format 2014-03-05 15:24:33 -05:00
Victor Shnayder
281ad63d2b split testing support in the LMS. 
Adds a split_test_module XModule, that can choose one of its children
to display, based on a get_condition_for_user API added to the runtime.

To test, add something like this to an xml course, or make equivalent
 tweaks in mongo.

 <vertical url_name="split_test_vert">
    <split_test url_name="split1" experiment_id="0" condition_id_to_child='{"0": "i4x://MITx/6.00x/html/split_test_cond0", "1": "i4x://MITx/6.00x/html/split_test_cond1"}'>
       <html url_name="split_test_cond0">condition 0</html>
       <html url_name="split_test_cond1">condition 1</html>
    </split_test>
  </vertical>

Also needs an experiment configured in the course policy json: e.g.

        "user_partitions": [{"id": 0,
                                      "name": "Experiment 0",
                                      "description": "Unicorns?",
                                      "version": 1,
                                      "groups": [{"id": 0,
                                                        "name": "group 0",
                                                        "version": 1},
                                                        {"id": 1,
                                                        "name": "group 1",
                                                        "version": 1}]}]

(This particular snippet will work inside a course with org MITx
 and course name 6.00x)

Co-Author: Sarina Canelake <sarina@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Diana Huang <diana@edx.org>
Co-Author: Calen Pennington <cale@edx.org>

[LMS-2095]
 2014-03-05 13:45:08 -05:00
Mark Hoeber
edafb7c09a Merge pull request #2800 from edx/ahodges/documentation/reformatevents 
Reformatted event type info to get it out of wide tables
 2014-03-05 11:04:55 -05:00
Alison Hodges
cefb47669a Reformatted event type info to get it out of wide tables 2014-03-05 11:02:50 -05:00
Sylvia Pearce
42f4f948c3 Corrected info about angle brackets in labels 2014-03-03 14:25:09 -05:00
Mark Hoeber
60f2a25ee8 Edits from review 
stud-1332
 2014-03-03 10:13:38 -05:00
Mark Hoeber
25d4b93dec Removed all Push mode information 
We should only support Pull mode

stud-1332
 2014-03-03 09:45:11 -05:00
srpearce
9a23be5379 Merge pull request #2769 from edx/sylvia/documentation/STUD-1293 
Sylvia/documentation/stud 1293
 2014-02-28 16:36:31 -05:00
Sylvia Pearce
19707d2776 Edits to polls and problem randomization 2014-02-28 16:18:11 -05:00
Sylvia Pearce
3bc8a41fc1 Add polls and randomization to problem information 2014-02-28 13:15:26 -05:00
srpearce
c5439de160 Merge pull request #2764 from edx/sylvia/documentation/BLD-672 
Fix typo
 2014-02-28 09:47:32 -05:00
Sylvia Pearce
35d5d11113 Fix typo 2014-02-28 09:46:43 -05:00
David Baumgold
837a1d79fa Merge pull request #2748 from edx/db/document-staff-debug-info 
Start documenting Staff Debug Info
 2014-02-28 09:04:16 -05:00
Sylvia Pearce
556f6bb0a4 Further updates to Polls 2014-02-27 17:07:33 -05:00
srpearce
c777f9c13c Merge pull request #2755 from edx/sylvia/documentation/BLD-672 
Update video docs for multiple language transcripts
 2014-02-27 15:39:59 -05:00
Sylvia Pearce
c4d0248a73 Add xref to Add Files in Video docs 2014-02-27 15:39:00 -05:00