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

23164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
52bc2aa070 Added rst version of cognitive load page 2014-05-15 16:35:05 -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
b99dd920be Merge pull request #3737 from edx/ahodges/documentation/fixup 
Correcting "make html" errors
 2014-05-15 11:07:32 -04:00
Alison Hodges
356723a634 Correcting "make html" errors 2014-05-15 09:23:05 -04:00
Carson Gee
de637f329e Merge pull request #3725 from carsongee/cg/transcript_xmlmodulestore_fix 
Fix bug affecting video transcripts in XMLModulesStore courses
 2014-05-15 08:50:36 -04:00
Oleg Marshev
a9649973aa Merge pull request #3648 from edx/oleg/fix-download-transcript 
Add mime-type for srt and sjson when importing course.
 2014-05-15 15:18:42 +03:00
Oleg Marshev
b9cd6cd6ec Add sjson and srt to type map. 2014-05-15 14:02:48 +03: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
Carson Gee
52d8317ab5 Fix bug affecting video transcripts in XMLModulesStore courses 2014-05-14 15:19:15 -04:00
Stephen Sanchez
0a6ea26c25 Merge pull request #3703 from edx/sanchez/course-anonymous-ids-in-csv 
Changing Student Anon ID Dump to return Course Specific IDs.
 2014-05-14 15:04:42 -04:00
Alison Hodges
ac01da61ed Merge pull request #3720 from edx/ahodges/documentation/LMS2591 
Changes for LMS-2591, Instructor Dash switchover
 2014-05-14 12:55:07 -04:00
Alison Hodges
5c5994816c Changes for LMS-2591, Instructor Dash switchover 2014-05-14 12:54:40 -04:00
Alison Hodges
00fb23d5ed Merge pull request #3689 from edx/ahodges/documentation/DOC405 
DOC-405: privileges in Studio=privileges in LMS
 2014-05-14 11:32:51 -04:00
Alison Hodges
614494aa1a DOC-405: privileges in Studio=privileges in LMS 2014-05-14 11:32:01 -04:00
Jay Zoldak
8ffc51689e Merge pull request #3598 from edx/zoldak/rebalance-cms-shards 
Rebalance CMS acceptance test shards
 2014-05-14 11:29:31 -04:00
Alison Hodges
8b38d9d382 Merge pull request #3698 from edx/ahodges/documenttion/DOC387 
Ahodges/documenttion/doc387
 2014-05-14 11:18:11 -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
Adam
08eb8fa7c1 Merge pull request #3706 from edx/adam/fix-non-ascii-grade-range 
Adam/fix non ascii grade range
 2014-05-14 10:52:28 -04:00
Mark Hoeber
ba7171b013 Merge pull request #3719 from edx/markhoeber/documentation/change-log-fix 
May change log fix
 2014-05-14 10:48:00 -04:00
Mark Hoeber
f321d7a8ee May change log fix 2014-05-14 10:27:04 -04:00
Stephen Sanchez
5cc41a6c9b Changing Student Anon ID Dump to return Course Specific IDs. 2014-05-14 09:56:36 -04:00
Waheed Ahmed
df3d6e3b06 Merge pull request #3714 from edx/waheed/lms1596-change-text-admin-dash 
Text changed in admin_dashboard for course enrollments.
 2014-05-14 18:30:51 +05:00
Waheed Ahmed
2b8fafec56 Text changed in admin_dashboard for course enrollments. 
LMS-1596
 2014-05-14 15:40:50 +05:00
David Baumgold
f8f542b677 Merge pull request #3710 from edx/db/add-to-authors-file 
Added @ksteph to AUTHORS file
 2014-05-13 17:16:09 -04:00
David Baumgold
c6ea63d3fd Added @ksteph to AUTHORS file 
See https://github.com/edx/edx-platform/pull/506
 2014-05-13 17:14:09 -04:00
Brian Talbot
2c9a7b51fd Merge pull request #3696 from edx/talbs/fix-lms-dashboard-images 
FIX - LMS: Dashboard Course Image Dimensions
 2014-05-13 16:35:58 -04:00
Brian Talbot
cd1ec5fd58 resolving display issue where older/smaller courses images wouldn't fill designated area on the student dashboard 2014-05-13 16:25:44 -04:00
Andy Armstrong
073115442c Merge pull request #3700 from edx/andya/split_test_has_children 
Specify that split_test_modules support children.
 2014-05-13 15:45:39 -04:00
Adam Palay
9b313d732f fix bug 2014-05-13 15:32:46 -04:00
Adam Palay
2b95b0ba36 add failing tests for non-ascii characters in grade cutoffs on progress page (LMS-2687) 2014-05-13 15:32:23 -04:00
e0d
9407102b45 Merge pull request #3697 from edx/e0d/revert-mysql-upgrade 
reverting the upgrade
 2014-05-13 13:04:27 -04:00
Andy Armstrong
4adc608f48 Specify that split_test_modules support children. 2014-05-13 12:36:45 -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
Brian Wilson
dcf27a9b74 Merge branch 'release' 2014-05-13 11:11:22 -04:00
Brian Wilson
d6a74a644d Merge branch 'master' into release 
Conflicts:
	cms/static/js/views/modals/edit_xblock.js
 2014-05-13 11:10:48 -04:00
Sarina Canelake
209c0d703f Merge pull request #3685 from edx/sarina/051314-language-update 
Update translations (autogenerated message)
 2014-05-13 10:52:10 -04:00
e0d
eced86d6ce reverting the upgrade 2014-05-13 10:36:07 -04:00
David Baumgold
09e3a86d43 Merge branch 'shindere/fix-debug-toolbar-lms' for PR #3401 2014-05-13 10:32:59 -04:00
Sébastien Hinderer
7c078e04d3 Add myself to AUTHORS. 2014-05-13 10:31:25 -04:00
Sébastien Hinderer
ec31a42637 CMS: debug toolbar should be displayed on dev stack. 
In Studio, the debug tool bar did not appear as in LMS.
 2014-05-13 10:30:59 -04:00
Waheed Ahmed
7a96faf9a3 Merge pull request #3585 from dragonfi/master 
Fix #3347: "Run Code" reloads page in Matlab Problem
 2014-05-13 19:06:40 +05:00
Sarina Canelake
24756bdbea Update translations (autogenerated message) 2014-05-13 10:01:37 -04:00
Carson Gee
eadf3b59e2 Merge pull request #3464 from mitocw/cg/course_image_fixes 
Additional logic to handle more course_image URL edge cases
 2014-05-13 09:19:07 -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
Nick Parlante
c30665fb59 Merge pull request #3677 from edx/nick/fix-feedback-bug 
Fix targeted-feedback bug
 2014-05-12 15:23:44 -07:00