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

3889 Commits

Author SHA1 Message Date
Nimisha Asthagiri
8855b12b76 Update tests to allow LMS tests to use published branch setting. 
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
 2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
ea32529866 Fix all modulestore calls to pass in user ids. 2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
f5abef88c2 LMS-2947 remove get_error_courses in Split. 
LMS-2950 move delete_course to Mongo.
 2014-07-09 21:10:12 -04:00
Julia Hansbrough
545cfd8406 Merge pull request #4353 from edx/flowerhack/lms-deprecated-urls 
Enables LMS to handle deprecated URLs
 2014-07-09 18:23:00 -04:00
jhelbert
451953752e Merge pull request #4285 from edx/jhelbert/enrollment-mode-change-events 
Jhelbert/enrollment mode change events
 2014-07-09 17:57:39 -04:00
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs 
LMS-2651
 2014-07-09 21:51:37 +00:00
Justin Helbert
e78a398f45 This emits enrollment mode changes events 2014-07-09 20:27:00 +00:00
Don Mitchell
211f0797fb Merge pull request #4294 from edx/split_mongo_assets_cherry 
Split mongo assets cherry
 2014-07-09 14:22:04 -04:00
Don Mitchell
cc6dfbbc75 Asset support in split 
LMS-2876
 2014-07-07 17:11:43 -04:00
Adam Palay
d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster 
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
 2014-07-07 13:54:03 -04:00
Carlos Andrés Rocha
1939678958 Use deprecated course_key when calling the analytics API. 
Previously it was serializing the course_key directly, which is not
interpreted correctly by the API.
 2014-07-03 12:25:16 -04:00
Carlos Andrés Rocha
5be08cc231 Don't show 500 errors if connection to data API fails 
Some of the metrics on the instructor dashboard are computed by the new
analytics data pipeline. Don't show 500 errors if the connection to the
pipeline API fails. Instead display that the data is not available and
log an error.

AN-1476
 2014-07-03 11:42:39 -04:00
Usman Khalid
446270c0ff Moved GeneratedCertificates.MODES back inside model. 
LMS-6631
 2014-07-01 19:46:51 +05:00
Anton Stupak
8201c9906a Merge pull request #4038 from edx/anton/redirect-on-error 
Add 401 error handler.
 2014-07-01 17:03:09 +03:00
Usman Khalid
6a3d5eb079 Do not refund student if a certificate entry already exists for them. 
LMS-2920
 2014-07-01 16:29:07 +05:00
Clinton Blackburn
d118fb8cb2 Get active student count from new analytics data API 
Disabled by default.
 2014-07-01 07:18:04 -04:00
Carlos Andrés Rocha
9261a3e6b9 Merge pull request #4234 from rocha/rocha/analytics-active-count 
Get active student count from new analytics data API
 2014-06-30 16:53:56 -04:00
Clinton Blackburn
36cfe7ab9e Get active student count from new analytics data API 
Disabled by default.
 2014-06-30 15:16:30 -04:00
Jim Abramson
5d37ea83f7 Merge pull request #4216 from edx/jsa/new-post-redesign 
consolidate new post form variants into single client-side template/view
 2014-06-30 14:39:46 -04:00
David Baumgold
ded1a752a8 Merge pull request #4210 from bdero/bdero/fix-sysadmin-dashboard-gitlog-timezone 
Make sysadmin dashboard gitlog date timezone-aware
 2014-06-30 14:33:01 -04:00
jsa
994ccd1110 consolidate new post form variants into single client-side template/view 2014-06-29 20:45:22 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Brandon DeRosier
36873ffc92 Datetime localized on gitlog page of sysadmin dashboard 2014-06-27 12:27:50 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540 
Refactor get_parent_locations STUD-1663
 2014-06-26 18:00:11 -04:00
James Tauber
238b4a5df1 tests for PR 3769 
Two out of three fail without PR 3769 but all pass with PR 3769.
 2014-06-26 10:37:58 -04:00
Christine Lytwynec
96e5139d66 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py
 2014-06-25 13:51:31 -04:00
Alexander Kryklia
c9afa056ad Move video descriptor instantiation in tests to single place. 2014-06-25 14:41:15 +03:00
Oleg Marshev
715fde27c4 Redirect Chinese students to a Chinese CDN for video. 2014-06-24 18:39:52 +03:00
Adam
a053dfbbd8 Merge pull request #4192 from edx/adam/change-logging-level-gradding 
Lower logging level in grading condition from exception to info
 2014-06-24 10:34:48 -04:00
polesye
584da69bee Fix unit test. 2014-06-24 14:26:02 +03:00
Adam Palay
d9f0a6ba68 Lower logging level in grading condition from exception to info 
addresses part of LMS-2907
 2014-06-23 16:50:28 -04:00
Adam
970d8dd2d0 Merge pull request #4190 from edx/usman/lms2848-htmlbooks-fix 
Fix for htmlbooks
 2014-06-23 16:16:12 -04:00
Piotr Mitros
4eb234e79f Merge pull request #4174 from edx/pmitros/chromeless-xblocks 
XBlocks can disable navigation chrome.

This allows for full-screen XBlocks (such as code IDEs), as well as allowing us to somewhat hackishly build top-level XBlocks. This is the first step on the path to non-hackish top-level XBlocks.
 2014-06-23 11:56:05 -04:00
polesye
a52b25779d Use confirm dialogue. 2014-06-23 18:24:53 +03:00
polesye
2629b48de8 Fix unit test. 2014-06-23 17:56:28 +03:00
polesye
2c27c424f9 Update error code. 2014-06-23 17:56:28 +03:00
Usman Khalid
d36e00d4a5 Pass storage_url and token values as parameters to StudentNotes init. 
LMS-2848
 2014-06-23 16:38:02 +05:00
Andy Armstrong
20675857dc Merge pull request #3999 from edx/christina/updating-split-test 
Ability to change the associated group configuration for a split test
 2014-06-20 14:15:41 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Piotr Mitros
afe22ca42e Review from Cale 2014-06-20 10:57:11 -04:00
Piotr Mitros
e644f641ac Explicit disable_accordion 2014-06-20 10:29:17 -04:00
Muhammad Ammar
15839147c2 Youtube Video Quality Button Tests 2014-06-20 13:48:27 +00:00
Piotr Mitros
4f303a623b XBlocks can disable navigation chrome. 
There is an option to:
* Enable/disable accordion navigation
* Enable/disable/repoint tab navigation

This allows for full-screen XBlocks (e.g. a code IDE, or large video
player). It is also the first pass at allowing top-level XBlocks. It's
also now possible to make a chromeless XBlock, point a tab to it, and
make it point back to that tab.

Next steps down that path would be:
* Fix up how tabs are handled. The current version is a hack.
* Create appropriate XBlocks for courseware, tabbed navigation,
  etc. to reach feature parity
* Invert/rejigger the XML format.
 2014-06-19 21:06:08 -04:00
muhammad-ammar
0258e71ab1 Merge pull request #4146 from edx/ammar/remove-flash-test-scenarios 
Remove Flash Test Scenarios
 2014-06-20 00:08:40 +05:00
Sarina Canelake
30c8da1596 Fix variable names to give context for translators 
fix other various i18n issues
 2014-06-18 23:28:39 -04:00
Muhammad Ammar
3f88ff662e Remove Flash Test Scenarios 2014-06-18 10:47:32 +00:00
Waqas Khalid
9e6333f689 Remember the user last thread sort preference 
FOR-545
 2014-06-18 14:26:30 +05:00
Sarina Canelake
a8cd760ce3 Merge pull request #4121 from edx/sarina/fix-i18n-bugs 
Fix i18n translation issues
 2014-06-17 16:14:41 -04:00
Mathew Peterson
9659f24d02 Merge pull request #4133 from edx/mathewpeterson/fix_unicode_in_url_bug 
404 error for unwanted unicode in url
LMS-2488
 2014-06-17 14:46:35 -04:00
Minh-Tue Vo
ca045aaa3d Merge pull request #4139 from edx/mvo/removing-dots 
Removing dot in scenario names
 2014-06-17 14:43:03 -04:00