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

632 Commits

Author SHA1 Message Date
Mark Hoeber
a7139a84b6 Add stevedore requirements for RTD builds 2014-05-19 14:58:54 -04:00
Mark Hoeber
1e27f177da Adding opaque keys module to system path in doc configuration 
To make RTD work.
 2014-05-19 13:46:07 -04:00
Calen Pennington
2ce6719153 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-19 09:29:34 -04:00
Calen Pennington
8f72394e81 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/templates/widgets/header.html
 2014-05-19 09:20:08 -04:00
Mark Hoeber
27ff0db57b Added new context sensitive link and updated text 
Sock template changes
 2014-05-16 20:38:09 -04:00
Nimisha Asthagiri
84d8fcf1b5 Acceptance tests for online help. 2014-05-16 20:38:09 -04:00
Mark Hoeber
8fcbdaed03 Update of all templates 
Changed help button to link and removed drop-down items
 2014-05-16 20:38:09 -04:00
Nimisha Asthagiri
b7440a51e8 Dev support for context-sensitive help. 2014-05-16 20:37:32 -04:00
Calen Pennington
18c91d0f1d Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html
 2014-05-16 14:01:20 -04:00
David Baumgold
2549551e3c Merge pull request #3752 from edx/db/doc-cognitive-load 
Added rst version of cognitive load page
 2014-05-16 13:59:39 -04:00
David Baumgold
8afe315ce4 link to code considerations page from contributor doc 2014-05-16 13:59:21 -04:00
Calen Pennington
bad2941f09 Add napoleon to the requirements to build our docs 2014-05-16 13:49:55 -04:00
Sylvia Pearce
14f3bcfe66 Update Video docs to reflect new UI 2014-05-16 11:52:19 -04:00
David Baumgold
867ea2b637 renamed cognitive_load.rst to code-considerations.rst 2014-05-16 09:28:50 -04:00
David Baumgold
adf6df224e address review comments from @nedbat 2014-05-16 09:28:05 -04:00
David Baumgold
138bd78e93 add So You Want to Deploy a New Service 2014-05-15 16:44:53 -04:00
David Baumgold
52bc2aa070 Added rst version of cognitive load page 2014-05-15 16:35:05 -04:00
Calen Pennington
f35379a838 Update opaque_keys docs 2014-05-15 16:12:40 -04:00
Mark Hoeber
76d511ad72 Merge pull request #3705 from edx/markhoeber/documentation/doc-400 
Release Notes 05/14/14
 2014-05-15 14:10:51 -04:00
Mark Hoeber
529d2fa33f Release Notes file setup 
DOC-400
 2014-05-15 14:10:11 -04:00
Alison Hodges
356723a634 Correcting "make html" errors 2014-05-15 09:23:05 -04:00
Alison Hodges
e70ea9a115 Merge pull request #3722 from edx/ahodges/documentation/DOC156 
Ahodges/documentation/doc156
 2014-05-14 16:42:54 -04:00
Alison Hodges
ca1afe4695 Reformatted tables, copy edited, and proofread. 2014-05-14 16:42:00 -04:00
Alison Hodges
5c5994816c Changes for LMS-2591, Instructor Dash switchover 2014-05-14 12:54:40 -04:00
Alison Hodges
614494aa1a DOC-405: privileges in Studio=privileges in LMS 2014-05-14 11:32:01 -04:00
Alison Hodges
aa7de7e2be Staff Debug includes links to reset/rescore/delete state for a student 2014-05-14 11:17:22 -04:00
Mark Hoeber
f321d7a8ee May change log fix 2014-05-14 10:27:04 -04:00
srpearce
0a51b2ad12 Merge pull request #3695 from edx/sylvia/docs/DOC-359 
Sylvia/docs/doc 359
 2014-05-13 11:13:42 -04:00
Sylvia Pearce
c6f80bff2f Update Vital Source and LTI component information 2014-05-13 11:13:03 -04:00
Alison Hodges
489eceee83 Merge pull request #3690 from edx/ahodges/documentation/DOC326 
Added username as option for batch enrollment/unenroll
 2014-05-13 09:13:57 -04:00
Alison Hodges
f3d11250ee Added username as option for batch enrollment/unenroll 2014-05-13 09:13:29 -04:00
Alexander Kryklia
a3004de974 Merge pull request #3488 from edx/alex/paver_dev 
Add dev command to run in native envs.
 2014-05-13 10:53:29 +03:00
Mark Hoeber
2c83e77c05 Release notes date fix 2014-05-12 13:56:28 -04:00
Mark Hoeber
65e9efb5ec Merge pull request #3601 from edx/markhoeber/documentation/doc-331 
Release Notes for 5-6-14
 2014-05-12 13:49:40 -04:00
Alexander Kryklia
c13282462a Modify paver run_all_servers to allow different settings for LMS and Studio. 2014-05-12 17:12:40 +03:00
Ned Batchelder
c7543dd33d Add more links in the PR guidelines. 2014-05-09 13:53:16 -04:00
Sylvia Pearce
28a2efeace Add VitalSource information 2014-05-09 13:25:38 -04:00
Mark Hoeber
3a185b2656 Note about course staff and discussion admin roles 
doc-309
 2014-05-09 11:36:32 -04:00
srpearce
f4d97ca55d Merge pull request #3652 from edx/sylvia/docs/DOC-390 
Fixed typos in example code for drag and drop problems
 2014-05-09 09:51:30 -04:00
Sylvia Pearce
91534bf0f0 Fixed typos in example code for drag and drop problems 2014-05-08 17:00:59 -04:00
Mark Hoeber
95e1ee6e7b Added warnings about file size 
doc-344
 2014-05-08 15:54:07 -04:00
Mark Hoeber
04376e085e Merge pull request #3637 from edx/markhoeber/documentation/doc-308 
Fixed typo
 2014-05-07 16:32:03 -04:00
Mark Hoeber
37ce55ce16 Fixed typo 
doc-308
 2014-05-07 16:16:01 -04:00
Sylvia Pearce
febadfa638 Add peer- and self- only information 2014-05-07 11:22:17 -04:00
Mark Hoeber
9fb2a8c753 Release Notes for 5-6-14 
Doc-331
 2014-05-07 10:53:04 -04:00
Alison Hodges
0d4df33379 Describe date format for close/reopen discussions 2014-05-07 09:13:08 -04:00
Sylvia Pearce
b8b92b9c8e Update LTI component information per new Studio UI 2014-05-06 14:14:00 -04:00
Alison Hodges
ee05d018ee Added enrollment events and new member fields 2014-05-06 11:49:36 -04:00
Alison Hodges
482931d0cd Corrected the change log 2014-05-06 09:35:55 -04:00
Alison Hodges
0f96853c2f Merge pull request #3524 from edx/ahodges/documentation/DOC286 
added a new topic on interpreting score histograms
 2014-05-06 09:34:12 -04:00