Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,784 Commits 1 Branch 0 Tags
263bcaf2fc60a5cf46bddc4e1d4763ef6b95ae08
Commit Graph

271 Commits

Author SHA1 Message Date
aamir-khan
9f0f081a1f ECOM-1916: updated the dispaly 2015-07-28 14:59:48 +05:00
Awais
1d2bc6fd67 ECOM-1807 Adding provider thumbnail url. 2015-07-27 20:04:05 +05:00
zubair-arbi
a2dd5d91f6 update caching for eligibility email content and edx-logo 
ECOM-1525
 2015-07-27 11:14:38 +05:00
Braden MacDonald
5aa127a9bf Merge pull request #8995 from open-craft/masquerade-cohorts 
Allow previewing cohorted content when masquerading (SOL-1064)
 2015-07-26 11:18:23 -07:00
Will Daly
17f713aa4a ECOM-1911: Fixes to credit requirements in Studio. 
* Exclude orphaned XBlocks from requirements because they have been deleted.
* Sort ICRV requirements by start date, then by display name.
 2015-07-23 13:07:13 -07:00
chrisndodge
5e195c8eeb Merge pull request #8962 from edx/cdodge/proctoring-studio 
Integrate timed and proctored exam authoring into Studio
 2015-07-23 15:53:17 -04:00
Chris Dodge
3748119961 Integrate timed and proctored exam authoring into Studio 2015-07-23 14:43:17 -04:00
Braden MacDonald
0defc55b84 Allow previewing cohorted content when masquerading 2015-07-22 00:54:15 -07:00
Ahsan Ulhaq
06b085f8b4 credit eligibility and payment receipt email 
ECOM-1796
ECOM-1525
 2015-07-22 12:34:38 +05:00
Christina Roberts
e5928bacc2 Merge pull request #8894 from edx/andya/lms-requirejs 
Implement RequireJS Optimizer in the LMS
 2015-07-21 15:07:49 -04:00
Will Daly
a725e84233 Merge pull request #8983 from edx/will/ecom-1912-and-1913 
Credit progress page formatting bugfixes.
 2015-07-20 14:14:53 -07:00
Will Daly
d3f58b689f Credit progress page formatting bugfixes. 
* Correctly format the student's full name on the progress page.
* Add tests for progress page credit requirements display.
* Display grade percentage for credit requirement on progress page
 2015-07-20 13:08:13 -07:00
Andy Armstrong
7b5f9b8009 Implement RequireJS Optimizer in the LMS 
TNL-2487
 2015-07-20 13:59:54 -04:00
Renzo Lucioni
b50c905865 Remove modulestore dependency from Enrollment API 
Sets the Enrollment API free of the modulestore by replacing modulestore queries with calls to the CourseOverview model. Course deletion invalidates the corresponding CourseOverview. XCOM-462.
 2015-07-20 13:41:19 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test 
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
 2015-07-17 17:42:03 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
srpearce
b12d3f6303 Merge pull request #8773 from edx/sylvia/docs/DOC-2102 
Sylvia/docs/doc 2102
 2015-07-17 15:42:59 -04:00
Sylvia Pearce
eea3b31105 Delete white spaces that are causing test failures 2015-07-17 16:12:53 +00:00
Awais Jibran
2d19eafa7c Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required 
Decorated instructor dashboard with sudo_required.
 2015-07-16 21:12:43 +05:00
aamir-khan
d5dda6470e ECOM-1816: added the provider detail on the receipt page. 2015-07-16 18:25:03 +05:00
Tasawer
1ded8b546c Update code of get_eligibility api. 
ECOM-1858
 2015-07-16 12:52:16 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Sylvia Pearce
d2b6ac84d3 Reorganize and update API documentation 2015-07-15 14:31:02 -04:00
Kyle McCormick
e1472080da MA-1036 Make CourseOverviews handle malformed grading policies 2015-07-15 14:16:18 -04:00
Tasawer
6e788d95b9 new view added "get_provider_detail" for getting provider info with provider_id 
ECOM-1858
 2015-07-15 12:25:26 +05:00
Sarina Canelake
8283c07e32 Remove superfluous-parens pylint violations 
Skipped 'print' statement violations, as print() is Py3k syntax.
 2015-07-13 17:33:28 -04:00
Sarina Canelake
22bbdacee9 Convert Meta classes to new-style classes 2015-07-13 17:33:26 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00
Ben McMorran
ccf20e52b1 TNL-2458 Cache discussion id mapping on course publish 2015-07-13 20:12:52 +00:00
Adam Palay
2c6264077d address quality violation 2015-07-13 15:09:53 -04:00
Adam Palay
213dc70d1e update to course import (TNL-2270) 2015-07-13 14:17:26 -04:00
zubair-arbi
71ce4d071b add 'provider_description' field for CreditProvider model 
ECOM-1842
 2015-07-09 13:13:37 +05:00
zubair-arbi
8a65167d79 Merge pull request #8795 from edx/zub/story/ecom-1815-update-creditprovider-model 
add 'fulfillment_instructions' for 'CreditProvider' model
 2015-07-09 12:04:53 +05:00
Brandon DeRosier
2bfbda3c1e Revert "edX Course/Library Import/Export API" 
This reverts commit c94abd2705.
 2015-07-08 16:55:38 -04:00
Brandon DeRosier
783e83deb0 Revert "Add feature flag for Import/Export API in LMS" 
This reverts commit 85b3bfe4f6.
 2015-07-08 16:55:38 -04:00
Will Daly
4b64df74b1 Fix migrations 0012 and 0013 in the credit app 
Adds the "order" field that was introduced in 0011 to the "models"
dictionary of migrations 0012 and 0013 so South knows that
the field should exist after 0011 is run.
 2015-07-08 16:55:37 -04:00
Kyle McCormick
1dfe9ed9e8 MA-779 Update student dashboard to use CourseOverview 2015-07-08 12:05:38 -04:00
Kyle McCormick
5b630a7704 MA-779 Make has_access work on CourseOverview objects 2015-07-08 12:05:38 -04:00
zubair-arbi
66e18eda56 add 'fulfillment_instructions' for 'CreditProvider' model + add api method to get credit provider data 
ECOM-1815
 2015-07-08 15:12:36 +05:00
Will Daly
104bcd5143 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	common/djangoapps/student/views.py
	openedx/core/djangoapps/credit/tests/test_api.py
 2015-07-07 09:58:45 -07:00
Sarina Canelake
b26f2af585 Revert "Adding entries of Call Stack Manager in StudentModule and StudentModuleHistory" 2015-07-07 05:45:23 -04:00
Will Daly
e67975b275 Feature flag credit provider messaging on the dashboard. 
When the credit eligibility is disabled, skip the code
that access the CreditProvider table.  This will allow us
to safely delete a column from the table in rc/2015-07-08.
 2015-07-06 12:56:15 -07:00
utkjad
10a3863832 Enable CallStackManager on StudentModule and StudentModuleHistory to capture any use outside of DjangoXBlockUserStateClient 2015-07-06 18:11:05 +00:00
Ben McMorran
351e491c82 Add generic paging framework 
Authors:
  - Daniel Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
 2015-07-06 08:45:03 -04:00
Usman Khalid
fe54b085c6 Added ability to disable xblock types in LMS. 
TNL-2305
 2015-07-03 20:58:40 +05:00
Ned Batchelder
e6e5a8d812 Convert some try/finally to addCleanup 2015-07-02 19:31:48 -04:00
David Ormsbee
db3de51ad4 Merge pull request #6190 from mitocw/bdero/import-export-api 
Public Course Import/Export API
 2015-07-02 16:29:41 -04:00
Will Daly
8824d032d4 Merge pull request #8767 from edx/will/optimize-credit-reqs-update 
Credit requirement optimizations
 2015-07-02 12:37:26 -07:00
Brandon DeRosier
85b3bfe4f6 Add feature flag for Import/Export API in LMS 
This feature flag gates the exposure of the Full course/library
Import/Export API URLs in the LMS. This allows openedX deployments
that operate without Studio to take advantage of the API, while
others may turn the feature off to reserve all content authoring for
Studio.
 2015-07-02 15:32:00 -04:00
Brandon DeRosier
c94abd2705 edX Course/Library Import/Export API 
This is a public, versioned, RESTful API for importing and
exporting full course content. The code was initially ripped from the
existing import/export API in the CMS contentstore djangoapp and wrapped
in Django Rest Framework view classes. It's a new djangoapp in
the openedx directory which is largely an abstraction off the CMS
Import/Export views.

This PR includes configuration changes. Most notably, Studio is
configured to serve the OAuth2 provider alongside the LMS.

This is the initial thread on the code list:
https://groups.google.com/forum/#!msg/edx-code/DmnHWmly25A/ZqjD1zb4o7oJ

And this thread contains another description of the changes:
https://groups.google.com/d/msg/edx-code/6dP9SEKsmqQ/Pvyn8fBDx68J

There are a numerous non-covered lines, all of which are missing
coverage in the CMS API this was ported from. They're mostly error
conditions, such as handling of multipart file upload errors.
 2015-07-02 15:32:00 -04:00