Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

193 Commits

Author SHA1 Message Date
Ahsan Ulhaq
d35b652843 Display Eligibility table on progress page 
1-Adding basic html for displaying eligibility table
2-Updated Eligibility Requirements Dynamically

ECOM-1523
 2015-06-16 16:19:33 +05:00
Nimisha Asthagiri
1a15bd7bed Merge pull request #8209 from edx/mobile/xblock-support 
Course Blocks + Navigation API (feature flagged) for Mobile
 2015-06-12 11:25:23 -04:00
Nimisha Asthagiri
65e330e8b5 Make RequestCache reusable 2015-06-12 09:27:16 -04:00
zubair-arbi
3204c8b3fe show credit eligibility requirements in studio 
ECOM-1591
 2015-06-12 13:19:57 +05:00
Will Daly
9d60b0e07a Merge pull request #8444 from edx/will/credit-provider-part-two 
Credit provider integration Python API (Part 2 of 3)
 2015-06-11 17:38:42 -04:00
Will Daly
8988aa1c9e Credit provider integration Python API 
* Add end-point for initiating a request for credit from a provider.
* Add an end-point for a provider to update the status of a request (approved / denied).
 2015-06-11 11:34:25 -04:00
Clinton Blackburn
2da42d5efa Removed IsAuthenticatedOrDebug 
IsAuthenticatedOrDebug hides potential issues with API client code that is run in local environments and later deployed to production where authentication fails.

XCOM-193
 2015-06-10 18:55:27 -04:00
Ben McMorran
695f19c420 TNL-1907 Implement Course Team Membership API 2015-06-10 20:40:02 +00:00
Mark Hoeber
7c2a4bc737 Merge pull request #8214 from edx/markhoeber-doc1987 
Profile Images API doc
 2015-06-09 12:51:58 -04:00
Mark Hoeber
0df14f53d9 Profile Images API doc 2015-06-09 11:54:31 -04:00
Will Daly
36d1eb22cd Merge pull request #8338 from edx/will/credit-provider-integration 
Credit provider integration Python API (Part 1 of 3)
 2015-06-09 11:12:51 -04:00
Diana Huang
cddd387beb Merge pull request #8367 from edx/diana/merge-course-view-and-tab 
Refactor and merge CourseViewType and CourseTab.
 2015-06-08 16:08:27 -04:00
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab. 
TNL-2321
 2015-06-08 15:18:39 -04:00
Will Daly
e5a62aaaba Credit provider integration Python API 
* Add Python API functions for creating and updating requests for credit.
* Add Django models and migrations for tracking credit requests and status.
 2015-06-08 13:30:32 -04:00
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04:00
Nimisha Asthagiri
65bcc50e9b Merge pull request #8240 from edx/mobile/render_xblock 
MA-722 Render xBlock API
 2015-06-05 12:13:05 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
Ahsan Ulhaq
5f74a1406e Set up Credit Provider Model 
Update credit Provider model and register in admin

ECOM-1555
 2015-06-05 12:25:02 +05:00
Greg Price
73d891313a Add thread editing to discussion API 
This is done via PATCH on a thread instance endpoint.
 2015-06-04 10:56:43 -04:00
Ben McMorran
f01b2f4311 Merge pull request #8243 from edx/benmcmorran/team-api-a 
TNL-1897: Implement Course Team API, Part A
 2015-06-03 14:59:36 -04:00
Ben McMorran
9d336c33eb TNL-1897 Implement Course Team API 2015-06-03 18:04:17 +00:00
zubair-arbi
38b859fd40 use 'name' field in 'CreditRequirement' model to save the location of xblocks 2015-06-03 18:54:33 +05:00
Aamir
110a7b1af4 Merge pull request #8232 from edx/aamir-khan/ECOM-1592-ICRV-credit-requirement-new 
ECOM-1592: Adding incourse reverification as a credit requirement in …
 2015-06-03 11:58:23 +05:00
Diana Huang
15291aa43b Merge pull request #8015 from edx/andya/add-tab-extensions 
Add extensible course view types for edX platform
 2015-06-02 17:08:45 -04:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -04:00
Andy Armstrong
94e1c42314 Add extensible course view types for edX platform 2015-06-02 13:12:40 -04:00
Will Daly
58d24111f5 Add additional "reason" field to CreditRequirementStatus 
* Add "reason" JSON-encoded field to CreditRequirementStatus.
* Add a "failed" status to CreditRequirementStatus.status choices.
 2015-06-02 11:17:11 -04:00
Ned Batchelder
cc5c1001d1 Fix simplifiable-range pylint warnings. 2015-06-02 09:47:13 -04:00
aamir-khan
41db8d8ec1 ECOM-1592: code refactoring 2015-06-02 16:31:23 +05:00
aamir-khan
810733db2c ECOM-1592: Adding incourse reverification as a credit requirement in course 2015-06-02 11:55:26 +05:00
Greg Price
d6cd09be1e Merge pull request #8217 from edx/gprice/discussion-api-create-comment 
Add comment creation to discussion API
 2015-06-01 17:01:30 -04:00
Greg Price
8fbfa2398e Add comment creation to discussion API 2015-05-29 11:05:02 -04:00
Will Daly
05ea62fb78 Fix credit requirement "criteria" name 
The CreditRequirement "configuration" field was renamed in Django
code without updating the migration.  This commit adds a second
migration to delete the incorrect field and add a new field.
The credit feature is currently disabled in production, so
the model isn't currently used by application code.
 2015-05-29 08:22:45 -04:00
Aamir
4a14ec694f Merge pull request #8122 from edx/aamir-khan/ECOM-1590-populate-requirements-table-new 
ECOM-1590: added the min_grade as a requirements
 2015-05-28 15:04:31 +05:00
aamir-khan
97b5ff7e8b ECOM-1590: added the min_grade as a requirements 2015-05-28 12:28:38 +05:00
Nimisha Asthagiri
a7fabd5927 Move generic mobile API view decorators. 2015-05-27 14:35:27 -04:00
Greg Price
93178bc395 Merge pull request #8170 from edx/gprice/discussion-api-create-thread 
Add thread creation to discussion API
 2015-05-26 14:22:00 -04:00
Jesse Zoldak
e424ce8a1d Merge pull request #8196 from edx/release 
Merge hotfix from release to master
 2015-05-26 14:15:09 -04:00
Daniel Friedman
09e1f9ed71 Fix XSS vulnerability in User Profile. 
TNL-2248
 2015-05-26 13:17:54 -04:00
Greg Price
f891450f50 Add thread creation to discussion API 
Also, fix the field-specific error format for all API endpoints.

This requires cs_comments_service commit fdf017c918.
 2015-05-26 12:42:40 -04:00
Awais
2599445190 ECOM-1590 adding models for credit eligibility. 2015-05-20 14:18:37 +05:00
Sarina Canelake
c7424dd7ae Supply default url for XQA server 2015-05-19 14:19:04 -04:00
Ned Batchelder
e97b94bde2 Merge pull request #8060 from edx/ned/add-supers 
Add super() calls to setUp/tearDown that are missing them
 2015-05-15 12:29:14 -04:00
muzaffaryousaf
cae5623fd9 Updating the django-countries version to support sorting. 
Adding the pyuca to support sorting in differnet languages.

TNL-2047
 2015-05-15 17:07:14 +05:00
Ned Batchelder
78e9445aa1 Add super() calls to setUp/tearDown that are missing them 
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
 2015-05-14 18:14:21 -04:00
Ned Batchelder
05cd3316d3 Fix pre-existing pylint errors. Diff-quality won't let me move the file otherwise. 2015-05-14 16:03:50 -04:00
Ned Batchelder
7c704f3959 Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py 2015-05-14 16:03:50 -04:00
Daniel Friedman
3acd7a008c Refactor and add tests for new grade report. 
* Handle grading errors
 2015-05-13 06:58:02 -04:00
Daniel Friedman
9269ec3b00 Add new instructor task for weighted problems 2015-05-12 16:32:00 -04:00
Greg Price
1f03a4df95 Merge pull request #7966 from edx/gprice/discussion-api-thread-list-more-fields 
Add fields to threads returned by Discussion API thread list endpoint
 2015-05-12 13:45:18 -04:00