Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,687 Commits 1 Branch 0 Tags
4946fbcd5bbe6ea2a2e13c15fc4043468f3cd3d0
Commit Graph

3337 Commits

Author SHA1 Message Date
Christina Roberts
03b6050348 Merge pull request #667 from edx/christina/read-only-api 
Make split mongo read-only API consistent with other modulestores.
 2013-08-15 13:05:58 -07:00
cahrens
9f229a4605 Make get_errored_courses part of the modulestore API (with default implementation). 
Also clarifies the contraction of location.course_id by throwing an exception for lcoations that are not of category course.

Add test for course_id method.
 2013-08-15 12:50:37 -04:00
chrisndodge
0db4c98782 Merge pull request #658 from edx/bugfix/ichuang/delete_course_group_not_exist 
catch error in delete_course management script when group does not exist
 2013-08-15 04:57:43 -07:00
Adam Palay
4855fd5af4 turn off i18n 2013-08-14 17:03:21 -04:00
David Ormsbee
3ce87583ab Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode. 
Features coming down the pipe will want to be able to:
* Refer to enrollments before they are actually activated (approval step).
* See what courses a user used to be enrolled in for when they re-enroll in
  the same course, or a different run of that course.
* Have different "modes" of enrolling in a course, representing things like
  honor certificate enrollment, auditing (no certs), etc.

This change adds an is_active flag and mode (with default being "honor").
The commit is only as large as it is because many parts of the codebase were
manipulating enrollments by adding and removing CourseEnrollment objects
directly. It was necessary to create classmethods on CourseEnrollment to
encapsulate this functionality and then port everything over to using them.

The migration to add columns has been tested on a prod replica, and seems to be
fine for running on a live system with single digit millions of rows of
enrollments.
 2013-08-14 13:23:06 -04:00
cahrens
13ef870b1b pylint/pep8 cleanup. 
cleanup.
 2013-08-14 09:59:44 -04:00
cahrens
e0aa46ab2d Make split mongo read-only API consistent with other modulestores. 2013-08-13 15:06:08 -04:00
Adam
8951ab7a66 Merge pull request #650 from edx/fix/adam/i18n-templates 
Fix/adam/i18n templates
 2013-08-13 08:39:46 -07:00
Peter Fogg
9ea2be5377 Merge pull request #643 from edx/peter-fogg/course-creation-validation 
Change course create form to asynchronous validation.
 2013-08-13 08:11:40 -07:00
Adam Palay
55ad55b9ca add PLATFORM_NAME and BUGS_EMAIL to cms/envs/common 2013-08-13 10:35:06 -04:00
Peter Fogg
b3aa20db64 Correctly clear fields when cancelling course create. 2013-08-13 09:18:36 -04:00
ichuang
03bcd19b8d catch error in delete_course management script when group does not exist 2013-08-13 08:46:21 -04:00
Peter Fogg
c611470e97 Correct non-unique course validation; code cleanup; better error style. 2013-08-12 16:28:41 -04:00
Julian Arni
7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime 
Conflicts:
	cms/djangoapps/contentstore/views/preview.py
 2013-08-12 15:04:49 -04:00
Julian Arni
91b23c406a Merge branch 'master' into jkarni/fix/descriptorsystemruntime 2013-08-12 15:00:26 -04:00
David Baumgold
6a3f0c141d Merge pull request #564 from edx/db/xblock-student-view 
XBlock integration for Studio: student view
 2013-08-12 11:55:40 -07:00
chrisndodge
bb644bb6ae Merge pull request #645 from edx/fix/cdodge/add-tech-support-email-config 
Add new setting to cms project
 2013-08-12 11:10:53 -07:00
Chris Dodge
7fd5a00c2c import default TECH_SUPPORT_EMAIL setting from LMS 2013-08-12 14:07:03 -04:00
Lyla Fischer
e817fb4ca1 Merge pull request #637 from edx/vaxxxa/videoalpha_to_video 
Migration videoalpha module to one main video module
 2013-08-12 10:56:12 -07:00
Chris Dodge
0231e64f36 also define TECH_SUPPORT_EMAIL in cms.envs.common config file 2013-08-12 13:41:05 -04:00
Chris Dodge
0da2fb842f Add new setting to cms project 2013-08-12 13:29:15 -04:00
Peter Fogg
8fa4b4dbd1 Change course create form to synchronous validation. 2013-08-12 12:41:41 -04:00
Will Daly
d1e0005f30 Merge pull request #622 from edx/will/fix-js-tests-using-number-input 
Failing JavaScript tests in Firefox
 2013-08-12 08:12:12 -07:00
Will Daly
4b738d4cc3 Refactored into helper method 2013-08-12 08:55:30 -04:00
Anton Stupak
74f3595d54 Add acceptance tests for checking rendering. 2013-08-12 14:32:15 +03:00
Peter Fogg
e20acee4c4 Working on Videoalpha test fix. 
Fixed all common and LMS tests.

The tests were failing because XMLDescriptor adds in some attributes
to _model_data, such as `xml_attributes`, that aren't necessary. The
solution is to handle all XML parsing in VideoDescriptor. There's
still one test failing in CMS, which has to do with metadata being
saved. I'm still working out how to update it in such a way that it
doesn't fail, but still tests something meaningful.
 2013-08-12 14:32:15 +03:00
Anton Stupak
d846462ce9 Migrate acceptance tests: old Video -> new Video. 2013-08-12 14:32:07 +03:00
Vasyl Nakvasiuk
b33b5c7bd4 Python: videoalpha -> video. 2013-08-12 14:31:48 +03:00
Anton Stupak
dad9f26a99 Make VideoAlpha out of Alpha. 2013-08-12 14:31:48 +03:00
ichuang
12ad9c8558 make CMS user view not show ErrorDescriptor courses 2013-08-11 15:27:12 +00:00
chrisndodge
4f321897df Merge pull request #620 from edx/feature/cdodge/convert-to-portable-links-on-import-and-clone 
Feature/cdodge/convert to portable links on import and clone
 2013-08-11 06:20:11 -07:00
Peter Fogg
8b2346fc51 Merge pull request #628 from edx/peter-fogg/fix-unit-delete-jump 
Fix jumping to the top of the page on unit delete.
 2013-08-10 06:48:51 -07:00
Chris Dodge
e23ec4f221 on the new envs configuration file, we need to squelch pylint errors on the from dev import * 2013-08-10 00:29:17 -04:00
Chris Dodge
c6f277427c add a few debug messages to get localhost debug information. Also partition out the MongoDjangoToolbar configuration into a separate env config. This is because doing imports on large courses grinds localdev to a halt due to all the stack trace generation. 2013-08-09 20:46:14 -04:00
Chris Dodge
b1b8f19c88 add another test. Seems like we never had an explicit test on an import into a new course-id. This fixes that 2013-08-09 20:46:13 -04:00
Chris Dodge
e2358af6a9 add ability to rewrite links on the old /courses/<org>/<course>/<run>/jump_to/i4x://<org>/<course> .. intracourseware linking to the new portable /jump_to_id/<id> format 2013-08-09 20:46:13 -04:00
Chris Dodge
25d6de243e add portable link rewriting on clone. Added tests. 2013-08-09 20:46:12 -04:00
Chris Dodge
36fda35040 do portable link rewriting on import and add test to confirm it 2013-08-09 20:46:12 -04:00
Giulio Gratta
464141c72a changing http:// to // on intro video urls to prevent browsers from blocking video embeds 2013-08-09 14:13:41 -07:00
JonahStanley
0595459c01 Revert back to old way of logging someone else in 2013-08-09 15:27:46 -04:00
Peter Fogg
cde8ee50d7 Fix jumping to the top of the page on unit delete. 2013-08-09 15:18:08 -04:00
JonahStanley
8feaa0ffa4 Added in a wait upon logging in 2013-08-09 13:57:22 -04:00
Will Daly
9769f364e1 Updated tests to weaken "number" input field requirement, which 
isn't supported in Firefox.
 2013-08-09 12:10:53 -04:00
chrisndodge
09a83dcd1e Merge pull request #589 from edx/fix/cdodge/better-export-error-messaging 
give some debug message regarding why export has failed
 2013-08-09 07:21:20 -07:00
Brian Talbot
5b4c15a57d Studio: revises export prompt control copy 2013-08-09 10:01:23 -04:00
Chris Dodge
481eac7fc8 address PR feedback 2013-08-08 21:25:42 -04:00
Chris Dodge
7b4388ba8c add more testing. Assert that metadata is properly cloned and that draft content is cloned as well 2013-08-08 21:25:42 -04:00
Chris Dodge
0e09ee61d7 update some unit tests on clone_course 2013-08-08 21:25:42 -04:00
Chris Dodge
32d92d97e6 get_item -> get_instance 2013-08-08 21:01:38 -04:00
Chris Dodge
487ae964e4 implement PR feedback 2013-08-08 21:01:38 -04:00