Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,405 Commits 1 Branch 0 Tags
3fcc904eaeabfbc84bb25de321fab49d76022fcc
Commit Graph

124 Commits

Author SHA1 Message Date
Clinton Blackburn
531ed41822 Updated the Credit API to support JWT authentication 2016-11-16 13:44:46 -05:00
Nimisha Asthagiri
aa000c1a3d Support for rescoring a problem only if the new score is higher 
TNL-5046
 2016-10-20 15:08:54 -04:00
Nimisha Asthagiri
84bdd8598b Merge pull request #13686 from edx/openedx_cleanup/misc 
Remove few LMS references from openedx/core
 2016-10-07 13:33:51 -04:00
Nimisha Asthagiri
9ae36152e8 Have core module use common's JsonResponse utility instead of LMS's. 2016-10-06 22:18:04 -04:00
John Eskew
3614eb2800 Move xmodule_django app to openedx.core.djangoapps 2016-10-06 14:50:40 -04:00
Nimisha Asthagiri
5822919549 Cache Enrollment state for (user, course) in request cache. 2016-09-12 15:56:03 -04:00
Awais Jibran
511de4c606 Hide credit button from audit track students 
ECOM-5081
 2016-08-11 23:20:01 +05:00
Calen Pennington
bc20a37c2b Simplify how shards are selected in CI 2016-08-03 16:23:02 -04:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming 
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
 2016-07-27 13:55:14 +05:00
cahrens
d061b8ddbe Use request_cache for storing disabled xblock names. 
TNL-5002
 2016-07-25 16:17:30 -04:00
Douglas Hall
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -04:00
Douglas Hall
51d8580982 Fix default from email lookups 2016-06-22 13:54:57 -04:00
Ibrahim
603546a04a replace references to settings.PLATFORM_NAME in edx-platform with theme overrides 2016-06-17 18:33:19 +05:00
asadiqbal
1c19ebb443 WL-477 2016-05-23 13:24:05 +05:00
Clinton Blackburn
28d4e2e8f4 Updated credit admin 
ECOM-4379
 2016-05-11 22:28:12 -04:00
Calen Pennington
ccaafce05b Merge pull request #12205 from cpennington/disable-caching-in-tests 
Disable caching in LMS tests
 2016-05-06 15:22:48 -04:00
Clinton Blackburn
bcd762ef91 Updated credit requirements logic 
Credit eligibility can be updated up to the point that the course is closed or the student submits a request for credit. Credit eligibility cannot be removed.

ECOM-4379
 2016-05-06 10:51:06 -04:00
Clinton Blackburn
9b24735cb9 Credit test cleanup 
Removed a lot of duplicate code!

ECOM-4379
 2016-05-06 02:59:11 -04:00
Clinton Blackburn
51715b9ec5 Exposing CreditRequirement and CreditRequirementStatus in admin 
ECOM-4379
 2016-05-06 02:59:11 -04:00
Calen Pennington
853bfe7a36 Add a TestCase mixin for enabling caches in tests 
By default, disable all caching in tests, to preserve test independence.
In order to enable caching, inherit from CacheSetupMixin, and specify
which cache configuration is needed.

[EV-32]
 2016-05-04 14:51:30 -04:00
Ned Batchelder
2e1238b83e Remove unused imports 2016-04-08 11:23:05 -04:00
J. Cliff Dyer
05218f954b Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-03-31 20:15:22 +00:00
J. Cliff Dyer
88fef8b2a4 Use renamed edx_oauth2_provider throughout. 
MA-1998 Install and configure django_oauth_toolkit to coexist with
existing oauth libraries.
 2016-03-30 14:21:17 +00:00
Tasawer
05898df1c1 updated dashboard with providers text 
ECOM-2935
 2016-03-29 09:26:35 +00:00
Awais
a154e7f1c3 Adding the ecom api functionality for the credentials. 
ECOM-2931
 2016-03-22 14:01:54 +05:00
Ben Patterson
c504029b39 Create a third shard for lms unit tests. 
This will leverage the nose attrib plugin to allow us
to break tests apart on our build system to run
in parallel on separate nodes.
 2016-03-17 12:01:42 -04:00
Ibrahim
97ef7397ce return course end date in credit service and rename flag 2016-03-08 19:12:19 +05:00
Ibrahim
c503c236a9 add student email in credit service 2016-02-22 14:45:25 +05:00
Hasnain
d06edc680b Added two fields in credit API 2016-02-11 10:13:37 +00:00
Usman Khalid
8bdc097293 Fixes after rebase to Django 1.8 2015-12-17 22:10:21 +05:00
Clinton Blackburn
01f0e2e37c Merge pull request #10824 from edx/clintonb/credit-auth-fix 
Corrected permission class and test
 2015-12-04 11:52:27 -05:00
Clinton Blackburn
c90880719f Corrected permission class and test 
- The permission now checks the correct request attribute (GET instead of data).
- The Credit API view test has been updated to check for the positive access instead of just denial.

 ECOM-3096
 2015-12-04 10:18:53 -05:00
Peter Fogg
8b97ca1b24 Merge pull request #10802 from edx/feature/remove-honor-code-certs 
Remove default honor code.
 2015-12-03 14:55:30 -05:00
Clinton Blackburn
c6bfac720f Updated credit migration for CreditProvider.provider_id 
There is no need for a separate migration for the validation. Updated the regex in the initial migration to appease Django.

ECOM-2609
 2015-11-25 14:52:34 -05:00
Peter Fogg
497622d4b4 Switch default course mode to 'audit'. 
ECOM-2972
 2015-11-25 11:22:29 -05:00
Clinton Blackburn
92153752c0 Rewrote Credit API 
- API built atop Django REST Framework
- Added support for OAuth 2.0 and session authentication
- Added permissions around eligibility data

ECOM-2609
 2015-11-24 22:06:54 -05:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations 
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
 2015-11-23 15:32:54 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
muzaffaryousaf
cc88cfaf64 Fixing "wrong-assert-type" pep8 warning. 
TNL-3650
 2015-10-29 15:01:49 +05:00
Clinton Blackburn
98a39b922e Updated CreditCourse update endpoint 
The update (PUT) endpoint now supports creating new CreditCourse objects in addition to updating existing ones. This functionality greatly simplifies the logic needed by consumers (e.g. the Course Administration Tool) to create or update CreditCourse objects.

ECOM-2524
 2015-10-24 20:13:54 -04:00
tasawernawaz
450e625d97 Merge pull request #10280 from edx/tasawer/story/ecom-2538-fix-for-multiple-providers 
Fix parameter name issue for multiple providers
 2015-10-22 09:48:22 +05:00
Tasawer
65c93d7ad5 Fix for multiple provider ids 
ECOM-2538
 2015-10-21 13:54:59 +00:00
Ned Batchelder
322ca34b20 Remove pylint pragmas from "class Meta" 
Also remove useless docstrings where they were added to keep pylint
quiet.
 2015-10-21 07:37:00 -04:00
Ahsan Ulhaq
7fa9d73a4c Update Credit Eligibility Table for Skips 
ECOM-2551
 2015-10-15 19:03:07 +05:00
Usman Khalid
f6193c872e Merge pull request #10059 from edx/usman/use-included-staticfiles-app 
Upgrade django pipeline to v.1.5.3.
 2015-10-08 16:10:36 +05:00
Clinton Blackburn
d9007455c1 Removed mailing address from provider request 
Given the time crunch this is the safest option for dealing with newlines.

ECOM-2492
 2015-10-06 14:15:14 -04:00
Usman Khalid
dbcd1bf430 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-06 19:52:38 +05:00