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

177 Commits

Author SHA1 Message Date
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
Greg Price
7ce579c274 Add group fields to thread list endpoint 2015-05-11 15:59:35 -04:00
Mark Hoeber
9e82d305d2 Adds preferences API and updates users to V1 with PEP8 fixes 2015-05-11 15:15:14 -04:00
Ben Patterson
937a16e589 Revert "Adds preferences API and updates users to V1" 2015-05-11 12:31:38 -04:00
Mark Hoeber
00184b83af Merge pull request #7862 from edx/markhoeber-doc1820 
Adds preferences API and updates users to V1
 2015-05-11 10:43:10 -04:00
Mark Hoeber
14ea62b3ec User preferences API doc 2015-05-11 10:42:35 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
Greg Price
90f28dce31 Add thread list endpoint to the new discussion API 
This is an initial implementation that only allows retrieval of all
threads for a course and only returns an easily computed subset of the
fields that are needed, in order to keep this change from getting too
large.

JIRA: MA-641
 2015-05-05 11:45:09 -04:00
Ned Batchelder
24e0c2c80f Run pylint on all our code, and only our code. TE-855 
With the old logic, we weren't running pylint on openedx at all.  We
were also running it on lms/lib/comment_client twice, and on the
installed xblock third-party library.
 2015-05-04 15:23:55 -04:00
Will Daly
f6e8ce24af Merge pull request #7879 from edx/will/restore-remember-me 
Add remember me checkbox back to the combined login/registration page
 2015-05-01 09:57:45 -04:00
Greg Price
c006befdaf Merge pull request #7767 from edx/gprice/discussion-api-topics 
Add discussion topic API
 2015-04-30 18:05:08 -04:00
Will Daly
05baddb2a6 Add remember me checkbox back to the combined login/registration page 2015-04-30 17:13:03 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Greg Price
ebff94af3f Add discussion topic API 
This is the first stage of the new Discussion API.

JIRA: MA-604
 2015-04-30 14:25:05 -04:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04:00
Adam Palay
ff82e5e42e do garbage collection when dumping memory 2015-04-29 10:40:53 -04:00
Andy Armstrong
f439a09e71 Obey microsite configuration for default profile image 
TNL-2073
 2015-04-27 15:04:51 -04:00
muhammad-ammar
cfcb38c498 Update user message strings 2015-04-17 17:23:19 -04:00
Andy Armstrong
17392ef3bf Code review feedback and test cleanup. 2015-04-17 17:23:19 -04:00