Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

1582 Commits

Author SHA1 Message Date
Peter Fogg
e4302e62d2 Allow course image uploads in the settings page. 
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
 2013-08-21 09:42:00 -04:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore 
Feature/cdodge/add a mixed modulestore
 2013-08-17 07:32:51 -07:00
Don Mitchell
7f126f13e9 Merge pull request #624 from edx/dhm/flatten_kvs 
xblock fields persist w/o breaking by scope
 2013-08-16 12:18:02 -07:00
Jay Zoldak
e91205aff3 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/video_module.py
 2013-08-16 14:25:03 -04:00
Don Mitchell
438bbffb93 Add field iterator which includes namespaced fields 
And fix get_explicitly_set to use it and to get the json not native
field values.
 2013-08-16 10:42:53 -04:00
Chris Dodge
ed584a9abb fix pep8 violations 2013-08-15 22:58:04 -04:00
Chris Dodge
e4eea6cc4f some additional comments to clarify the partially bogus course_id. 2013-08-15 22:58:03 -04:00
Chris Dodge
cff93d324b WIP 2013-08-15 22:58:02 -04:00
jkarni
a260115b01 Merge pull request #685 from edx/jkarni/fix/cms_pylint 
Contentstore views pylint fixes
 2013-08-15 16:05:09 -07:00
Chris Dodge
958597ac71 was getting unicode errors when exporting CB22x 2013-08-15 16:10:02 -04:00
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
Julian Arni
a29243fc7c Add logging to save item 2013-08-15 13:49:26 -04:00
Julian Arni
80619da429 Review fixes 2013-08-15 10:24:38 -04:00
Julian Arni
3ed4198204 Contentstore views pylint fixes 2013-08-14 19:10:00 -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
e0aa46ab2d Make split mongo read-only API consistent with other modulestores. 2013-08-13 15:06:08 -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
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
Vasyl Nakvasiuk
b33b5c7bd4 Python: videoalpha -> video. 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
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
32d92d97e6 get_item -> get_instance 2013-08-08 21:01:38 -04:00
Chris Dodge
4054544126 handle exceptions inside the outer exception handling 2013-08-08 21:01:38 -04:00
Chris Dodge
69c34a65b1 switch the notification to be a prompt and allow for the user to go to the edit unit page which contains the module in error. Otherwise, present the raw exception message and allow user to go to the course outline page. 2013-08-08 21:01:38 -04:00
Chris Dodge
fcaf3e6329 give some debug message regarding why export might fail 2013-08-08 21:01:38 -04:00
David Baumgold
32f76988c6 Update docstring 2013-08-08 09:53:19 -04:00
David Baumgold
7aec95c310 Removed get_module_previews function 
According to @cpennington, no modules return anything for `get_sample_state`,
so this function is extraneous.
 2013-08-08 09:52:41 -04:00
David Baumgold
a87a1bfcda Docstrings 2013-08-08 09:46:15 -04:00
David Baumgold
baa9bd5bdc Make sure to return the content, not the fragment 2013-08-08 09:46:15 -04:00
David Baumgold
8a95d7e6f0 XBlock integration: replaced get_html with runtime.render() 
Currently calls the same machinery, but re-routes the logic in preparation of
deeper integration with XBlock
 2013-08-08 09:46:15 -04:00
David Baumgold
9634e222be Refactored get_module_previews function 2013-08-08 09:46:15 -04:00
David Baumgold
4896444d10 Clean up item views, use JsonResponse class 2013-08-08 09:46:15 -04:00
chrisndodge
ece4ec3f57 Merge pull request #533 from edx/fix/cdodge/use-static-shorthand-for-asset-urls 
To increase portability of courses, have the Asset Index page display the classic /static/... URL shorthand.
 2013-08-08 06:32:35 -07:00
Christina Roberts
4c95078eb0 Merge pull request #578 from edx/christina/autoenroll 
Auto-enroll course staff to fix "View Live".
 2013-08-06 12:33:56 -07:00
chrisndodge
b24fdd9e22 Merge pull request #576 from edx/feature/cdodge/display-location-information-in-course-listings 
Feature/cdodge/display location information in course listings
 2013-08-06 10:27:38 -07:00
cahrens
3732d418c9 Add helper methods to hide internals of how users are enrolled in courses. 
Remove _

Minor cleanup.
 2013-08-06 09:36:39 -04:00
Chris Dodge
b8bc1d0171 remove redudent asset_url return value when uploading files 2013-08-05 16:15:03 -04:00
Chris Dodge
6200b2903f have the Files and Upload pages surface a 'portable_url' which uses the /static/ shorthand which is more portable across course runs 2013-08-05 16:15:03 -04:00
Adam Palay
f85cfc11fa redirects lms landing page to student.views.index if there is no marketing site 
resets the cms edge redirect to '/'
 2013-08-05 16:05:12 -04:00
cahrens
a227b14fdd Auto-enroll course staff to fix "View Live". 
STUD-554

Code review feedback.
 2013-08-05 15:00:37 -04:00
David Baumgold
94976df8d7 Check that content-type starts with application/json 
When Chrome sends the AJAX request to add a user to the course team, it sets the
Content-type to "application/json". However, when Firefox sends the same request,
it sets the Content-type to "application/json; charset=UTF-8". This commit only
checks that the Content-type begins with "application/json", not is identical
to it; that way, Firefox can play, too.
 2013-08-05 14:16:28 -04:00
Chris Dodge
09a3bc01be show the organization, course number, course run in the course listing page in CMS 2013-08-05 12:51:42 -04:00
Julian Arni
b38750e15d Refactor wrap_xmodule call 2013-08-05 11:09:43 -04:00
Adam Palay
0f18ea4bf7 redirects edge landing page to /dashboard 2013-08-02 17:18:49 -04:00
Julian Arni
7bfb0804f8 Switch to studio_view 2013-08-02 16:09:29 -04:00
David Baumgold
2ad78d949a Merge pull request #538 from edx/db/course-team-admin-grants 
Add error messaging to course team page
 2013-08-01 11:58:52 -07:00
David Baumgold
1b83cfc409 Merge pull request #546 from edx/db/dev-views 
Create urls/views/templates for dev-only views
 2013-08-01 11:47:39 -07:00
David Baumgold
741bbb3f92 pylint cleanup 2013-08-01 14:16:55 -04:00