Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
9feff62857 Merge pull request #3834 from cpennington/ok-merge-from-master 
Merge master into opaque-keys
 2014-05-23 11:36:52 -04:00
Jay Zoldak
bb4f9148e0 Skip intermittently failing js video tests 2014-05-23 11:21:57 -04:00
Nimisha Asthagiri
21ddc7db00 Fixed DeleteComponent on Container Page. 2014-05-23 11:05:37 -04:00
Will Daly
234550422d Merge pull request #3805 from edx/sanchez/TIM-563-Check-Django-Admin 
Adding new attribute to the xmodule_runtime to check admin privileges on users
 2014-05-23 10:41:31 -04:00
Calen Pennington
29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master 2014-05-23 10:05:56 -04:00
muhammad-ammar
ff1e9466be Merge pull request #3849 from edx/ammar/uniqe-course-fix 
Unique Course Fix
 2014-05-23 19:04:07 +05:00
Muhammad Ammar
3919b4a47b Unique Course Fix 2014-05-23 13:29:12 +00:00
zubair-arbi
0054b79d5a Merge pull request #3306 from edx/zub/bugfix/std1523-uploadassetbutton 
move upload asset code for assets to AssetsView
 2014-05-23 18:24:24 +05:00
Stephen Sanchez
afd55164e6 Adding new attribute to the xmodule_runtime to check admin privileges on users 2014-05-23 09:23:21 -04:00
Sarina Canelake
a0799f38bf Merge pull request #3844 from edx/sarina/lms-2748 
Sarina/lms 2748
 2014-05-23 09:18:50 -04:00
Jay Zoldak
33a2725919 Merge pull request #3850 from edx/zoldak/revert-paver-quality 
Revert "added and updated pavelib/quality.py..."
 2014-05-23 08:42:55 -04:00
Jay Zoldak
4771242d57 Revert "added and updated pavelib/quality.py from dglance branch, deprecated rake quality tasks" 
This reverts commit 7fd2305f39.
 2014-05-23 08:40:43 -04:00
Anton Stupak
77c3233f29 Merge pull request #3824 from edx/anton/fix-transcript-on-ipad 
Video: Fix transcript displaying on iPad.
 2014-05-23 10:49:56 +03:00
polesye
2133ebd0a2 BLD-1033: Fix transcript displaying on iPad. 2014-05-23 08:31:26 +03:00
Andy Armstrong
b6f933a1f5 Merge pull request #3838 from louyihua/translation-fix 
i18n: Make static strings in xmodule files extractable
 2014-05-23 00:30:22 -04:00
Sarina Canelake
faeee559fd Fix Instructor Dash UX (LMS-2748) 2014-05-22 16:53:20 -04:00
Jay Zoldak
4a86b926c5 Wait for ajax to complete when editing components in Studio acceptance tests 2014-05-22 16:45:18 -04:00
Calen Pennington
35083ad9f9 Fix bad uses of course_id/location/locator in new code on master 2014-05-22 16:24:02 -04:00
Calen Pennington
240fcc1d5a Fix merge conflicts 2014-05-22 16:24:02 -04:00
Don Mitchell
d24a777067 Remove package_id and remove lower_ stuff from migrator 
STUD-1603
 2014-05-22 16:09:43 -04:00
Alison Hodges
9588689bfb Updates to problem location for opaque keys 2014-05-22 16:00:57 -04:00
Diana Huang
16f0c9d1ee Merge pull request #3840 from antoviaque/mentoring-opaque-keys 
mentoring-opaque-keys: Adds support for opaque keys
 2014-05-22 15:45:48 -04:00
Jay Zoldak
9f6d0594d3 Merge pull request #3835 from edx/zoldak/skip-brittle-test 
Skip brittle HTML editor lettuce test
 2014-05-22 15:45:09 -04:00
Diana Huang
db0cd78152 Remove some outdated code. 2014-05-22 15:39:29 -04:00
Xavier Antoviaque
9df7e1d1cf mentoring-opaque-keys: Adds support for opaque keys 
Updates commit hash to add support for opaque keys in mentoring. See
https://github.com/gsehub/xblock-mentoring/pull/2 for the relevant
commits.
 2014-05-22 15:31:59 -04:00
Jay Zoldak
72cb5ec93f Merge pull request #3828 from edx/ammar/flaky-for-video-tests 
Flaky for Bok-Choy Video Tests
 2014-05-22 15:12:11 -04:00
srpearce
956b4c4569 Merge pull request #3837 from edx/sylvia/docs/movePA 
Update index file; change link in PA for Students
 2014-05-22 14:23:09 -04:00
louyihua
a6bae4d238 i18n: Make static strings in xmodule files extractable 
They can now be extracted.
 2014-05-23 01:58:19 +08:00
Sylvia Pearce
fb6dc771b4 Update index file; change link in PA for Students 2014-05-22 13:50:18 -04:00
Carson Gee
cc0832750d Adding django default log handlers into logging configuration 2014-05-22 12:45:05 -04:00
Mark Hoeber
afe306439f Merge pull request #3592 from edx/markhoeber/documentation/doc-389 
New Open edX Install/Operations doc
 2014-05-22 12:39:25 -04:00
Mark Hoeber
608eef2750 Merge pull request #3800 from edx/markhoeber/documentation/release-notes-fix 
Modified description of transcript bug fix
 2014-05-22 12:37:58 -04:00
Mark Hoeber
ad8a314aad Modified description of transcript bug fix 
As well as updated the index page for usability
 2014-05-22 12:37:07 -04:00
Jay Zoldak
7db6e639e2 Skip brittle test 2014-05-22 12:22:55 -04:00
Diana Huang
a69e42dd5a Merge pull request #3830 from edx/diana/fix-cohorting 
Fix cohorting views
 2014-05-22 12:13:15 -04:00
Diana Huang
ae95e07cce Deserialze values coming into course_groups views 2014-05-22 12:11:48 -04:00
Calen Pennington
fb65aad11e Merge pull request #3826 from cpennington/ok-use-deprecated-for-instructor-api 
Use old deprecated form for instructor api calls, and in staff debug info
 2014-05-22 12:07:16 -04:00
Mark Hoeber
b2647dab43 Set up for new Open edX Installation and Operations Guide 
doc-389
 2014-05-22 11:58:26 -04:00
Dave St.Germain
7bbffd8bee Merge pull request #3254 from edx/dcs/a11y-dragdrop 
This fixes a few accessibility problems with drag and drop
 2014-05-22 11:45:04 -04:00
Sarina Canelake
c7bf96f048 Merge pull request #3822 from edx/sarina/course-modes-display 
Sarina/course modes display
 2014-05-22 11:40:15 -04:00
Calen Pennington
8699a13b09 Use old deprecated form for instructor api calls, and in staff debug info 2014-05-22 11:24:05 -04:00
Andy Armstrong
dfbfd7b204 Merge pull request #3802 from louyihua/translation-fix 
i18n: Make checklists translatable
 2014-05-22 11:22:04 -04:00
Alison Hodges
7044cbb800 Merge pull request #3790 from edx/ahodges/documentation/DOC156 
Ahodges/documentation/doc156
 2014-05-22 10:58:55 -04:00
Ben Patterson
7d8b5ad2c3 Merge pull request #3796 from edx/benpatterson/disable-course-export-acc-test 
Benpatterson/disable course export acc test
 2014-05-22 10:56:29 -04:00
Don Mitchell
1223c8a08d has_course was incorrect, fixed 2014-05-22 10:52:24 -04:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
 2014-05-22 10:52:00 -04:00
Muhammad Ammar
33d01232de Flaky is a plugin for nose that automatically reruns flaky tests. 2014-05-22 14:51:57 +00:00
Alison Hodges
9955e9e383 Merge pull request #3798 from edx/ahodges/documentation/DOC402 
Adaptive hint correct_answer must be lc
 2014-05-22 10:50:47 -04:00
Alison Hodges
dc00ade1f0 Adaptive hint correct_answer must be lc 2014-05-22 10:49:39 -04:00
Dave St.Germain
285c07fc22 Addressed review feedback. 2014-05-22 10:40:31 -04:00