Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,344 Commits 1 Branch 0 Tags
9edda95096c775cdfe18bc6b3d376ea015d2a48a
Commit Graph

4930 Commits

Author SHA1 Message Date
Matt Drayer
8107f803f5 Merge branch 'release' 2015-03-25 13:38:43 -04:00
Will Daly
735b400998 Login/Registration page can skip track selection. 
Add querystring param "course_mode" to the login/registration
page so the user can skip track selection.

This supports upcoming changes to the course details page
that allow the user to choose the track when clicking
"enroll", which will replace the functionality of the track
selection page.
 2015-03-25 09:15:31 -04:00
Greg Price
0f0ee6a394 Merge pull request #7455 from edx/aleffert/video_web_only 
Add web-only setting to video module
 2015-03-23 15:38:18 -04:00
chrisndodge
4900d7a5ab Merge pull request #7452 from edx/cdodge/get-courses-filter 
do the ORG filtering as part of the mongo query. Also, don't trigger met...
 2015-03-23 15:07:09 -04:00
Greg Price
438ce5f7a4 Add web-only setting to video module 
This is needed for courses that license video content where the license
allows only for viewing on the web, not on mobile apps.

JIRA: MA-307
 2015-03-23 14:45:17 -04:00
Ned Batchelder
c08ccee45a Merge pull request #7450 from edx/ned/common-lib-to-openedx-core-lib 
Move common/lib/*.py to openedx/core/lib so that we can import them.
 2015-03-23 14:00:35 -04:00
Stephen Sanchez
798f91ca5a Merge pull request #7434 from edx/sanchez/track_internal_request_errors 
XCOM-147: Change error handling to report back internal errors.
 2015-03-23 13:26:06 -04:00
Ned Batchelder
a84735057d Move common/lib/*.py to openedx/core/lib 
This makes these files importable, and puts them into the new best guess
as to where files should live.
 2015-03-23 12:40:24 -04:00
Chris Dodge
b6a333f323 do the ORG filtering as part of the mongo query. Also, don't trigger metadata inheritence calculations when just trying to load 'about' information, which is not tied into the course tree anyhow (i.e. no parent/child relationship) 2015-03-23 12:28:20 -04:00
Stephen Sanchez
c01602f094 Change implementation of improved logging based on new API. 2015-03-23 16:21:05 +00:00
Will Daly
e66409be45 Merge pull request #7444 from edx/will/self-gen-certs-docstring-cleanup 
Docstring/messaging cleanup in self-generated certs view.
 2015-03-23 12:13:53 -04:00
Will Daly
30058b913c Merge pull request #7425 from edx/clrux/ux-1784-generate-certificates 
Styling for automatic cert generation on Progress page
 2015-03-23 11:23:43 -04:00
Stephen Sanchez
7af1ee3e5f Change error handling to report back internal errors. 2015-03-23 15:21:45 +00:00
Usman Khalid
6fb48eb159 Merge pull request #6706 from edx/ammar/tnl-181 
Allow Instructor To Rename Cohorts And Set Cohort Assignment Method.
 2015-03-23 19:49:03 +05:00
Chris Rodriguez
f8da29b9cf Styling for automatic cert generation on Progress page 2015-03-23 10:44:33 -04:00
Usman Khalid
c50f828187 Fixes after rebase. 2015-03-23 19:03:31 +05:00
Will Daly
659535365d Update error messaging for progress page self-gen certs 
Clean up docstrings for gen cert POST.
 2015-03-23 09:10:39 -04:00
Will Daly
3f2cd706e8 Merge pull request #7437 from edx/will/ecom-1229 
Course info page no longer creates enrollments.
 2015-03-23 08:32:15 -04:00
muzaffaryousaf
e6c75529c0 Cohort discussion topics via UI in instructor dashboard. 
TNL-1256
 2015-03-23 14:28:22 +05:00
Usman Khalid
e07f45b5dd Removed cohort_config from advanced settings page. 
TNL-1258
 2015-03-23 09:58:25 +05:00
Usman Khalid
d382f569c8 Refactor django_comment_client.utils.prepare_content() to query 
course cohort settings only once.

TNL-1258
 2015-03-23 09:57:07 +05:00
Usman Khalid
d59be9949e Use cohort settings from CourseCohortSettings. 
TNL-1258
 2015-03-23 09:43:00 +05:00
muhammad-ammar
9ce66c78fd Rename Cohort Management to Cohorts 
Move `Cohorts` section after `Membership` section
 2015-03-23 09:21:22 +05:00
Muhammad Ammar
3ce494f5c5 Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab 
TNL-1268
 2015-03-23 09:21:15 +05:00
Ned Batchelder
8a1877f0ad Merge pull request #7436 from edx/ned/upgrade-pylint 
Upgrade pylint
 2015-03-20 16:34:52 -04:00
Ned Batchelder
f396c11579 Fix unidiomatic type checking 2015-03-20 15:48:54 -04:00
Brian Talbot
c01ab4a824 Merge pull request #7430 from edx/talbs/fix-certs-csspath 
Certificates: Revising compiled CSS paths to match existing LMS patterns
 2015-03-20 15:41:44 -04:00
Will Daly
704e8836f0 Course info page no longer creates enrollments. 
The course info page was getting-or-creating
a course enrollment with is_active=0.  This commit
changes the operation to a "get" so that extra
enrollment records are not created.
 2015-03-20 15:22:20 -04:00
Clinton Blackburn
306a267de7 Updated create_order endpoint to use E-Commerce API for order creation and enrollment 
This functionality is activated by adding a SKU to a non-honor course mode. When the feature is activated, verified orders will be created by the E-Commerce Service instead of LMS. After payment, the E-Commerce Service will also create the enrollment.
 2015-03-20 14:53:23 -04:00
Adam
d012428c34 Merge pull request #7426 from edx/adam/merge-release-to-master 
Adam/merge release to master
 2015-03-20 10:42:22 -04:00
Brian Talbot
f4c3a732be certificates: revising compiled CSS paths to match existing LMS patterns 2015-03-20 09:54:58 -04:00
Ahsan Ulhaq
60cb7cf33a Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types 
Standrize buttons in assessment problems
 2015-03-20 18:50:27 +05:00
Syed Hassan Raza
d17a0c6ad2 handle invalid-key exception for split courses 2015-03-20 16:18:27 +05:00
Adam Palay
35e4e9d81f resolve more merge conflicts 2015-03-19 17:22:29 -04:00
Adam Palay
b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master 
Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py
 2015-03-19 16:30:46 -04:00
Martyn James
7c942dddb5 Merge pull request #7219 from edx/mjames/SOL-289 
Addresses problem with 'up' and 'down' errors within SOL-289
 2015-03-19 09:51:36 -04:00
alawibaba
9b79797b28 Created performance logging endpoint, changed CDN experiment to point to it. 2015-03-19 07:53:01 -04:00
zubair-arbi
ae2480e038 update instructor grade task state and increase logging 2015-03-19 07:52:22 -04:00
Clinton Blackburn
2e2fb47d59 Bypassing E-Commerce API if user is enrolled in course 
If a user is already enrolled in a course, the API is bypassed and a 409 status is returned.
 2015-03-18 23:21:18 -04:00
Ned Batchelder
a64d926845 Merge pull request #7399 from edx/ned/plat-462 
Make sure slashes in JSON content don't end script tags. PLAT-462
 2015-03-18 22:47:50 -04:00
Ned Batchelder
6928035cd1 Make sure slashes in JSON content don't end script tags. PLAT-462 
The string "</script>" in JSON data would end the script element we're
embedding the data in.  To make sure the data doesn't disrupt the
script, we escape the slash as \/ .
 2015-03-18 21:55:36 -04:00
Brian Wilson
243e2660b0 Merge release to master for 20150317 release. 2015-03-18 18:48:56 -04:00
Ned Batchelder
6ac1b82bb2 Merge pull request #7356 from edx/ned/fix-or-remove-teardown 
Fix or remove tearDown methods that don't use super.
 2015-03-18 17:36:17 -04:00
David Ormsbee
ff77505f42 Add caching to partitions_service. 2015-03-18 14:55:16 -04:00
Nimisha Asthagiri
d7386ecc87 Use depth=0 for call to cache_for_descriptor_descendents. 2015-03-18 14:55:15 -04:00
Nimisha Asthagiri
eca523e01e Mobile API MA-7: Support A/B test and cohorted content 2015-03-18 14:55:15 -04:00
Nimisha Asthagiri
091d6aebe9 Mobile API: Modularize VideoOutline code 2015-03-18 14:55:15 -04:00
Brian Talbot
6e3d5568bd Merge pull request #7345 from edx/talbs/certs-webview-uicleanup 
Certificates: Revising Web Templates + UI for Open edX Use
 2015-03-18 13:16:24 -04:00
Clinton Blackburn
ae5cbf8b70 Merge pull request #7347 from edx/clintonb/commerce-events 
Validating event emission by the commerce app
 2015-03-18 12:47:26 -04:00
Matt Drayer
10e9fed687 Pass required values via context to invalid template 2015-03-18 12:24:06 -04:00