Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,890 Commits 1 Branch 0 Tags
cc2fe585ec978100e7242c43841beb28023dcbfb
Commit Graph

42890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Troy Sankey
cc2fe585ec Remove PatchedClient, a django 1.4 shim. 2017-10-05 15:37:00 -04:00
Troy Sankey
d76a1ac014 Tests should make use of django test client's PATCH functionality 
Previously, these tests were skipped in order to support Django 1.4.
 2017-10-05 15:37:00 -04:00
Troy Sankey
46d8caa8cd Remove/update comments related to django 1.4 
Course keys as PKs don't appear to break detail links in admin pages
anymore.
 2017-10-05 15:35:01 -04:00
Rabia Iftikhar
b245fa0374 Merge pull request #16159 from edx/ri/EDUCATOR-139-add-charset-webOb-response 
EDUCATOR-139 Add charset to the WebOb response
 2017-10-05 22:42:43 +05:00
John Eskew
b07826cbc0 Merge pull request #16148 from edx/jeskew/initial_django_1.11_startup_changes 
Initial Django 1.11 startup changes
 2017-10-05 12:48:26 -04:00
Sofiya Semenova
4cd7a886be Merge pull request #16109 from edx/ssemenova/ed-1315-part2 
Remove "final course details" message, replace with another
 2017-10-05 12:40:45 -04:00
Ned Batchelder
37effa755b Merge pull request #16172 from edx/nedbat/nicer-rst 
Use nicer .rst for testing.rst
 2017-10-05 12:01:03 -04:00
John Eskew
f5f6b08884 Add missing 'later' variable. 2017-10-05 11:12:54 -04:00
John Eskew
762b87e25d Move xblock tagging model import into method. 2017-10-05 11:12:54 -04:00
John Eskew
0890193d6b PLAT-1408: Import csrf from new path. 2017-10-05 11:12:53 -04:00
John Eskew
4b95abb715 Make an AppConfig to register ccxcon signals. 2017-10-05 11:12:53 -04:00
John Eskew
040f5cc9c4 Move edxnotes model import down into method. 2017-10-05 11:12:53 -04:00
John Eskew
7dfb6cc681 Change all UTC timezones to import from pytz instead of Django. 2017-10-05 11:12:52 -04:00
John Eskew
02f26f55ce Remove unused imports. Push model imports down into relevant methods. 
Mock out the static_replace modules in the proper location.
 2017-10-05 11:12:52 -04:00
John Eskew
8b5b1eba86 Use Django 1.11 compatible version of django-countries. 2017-10-05 11:12:51 -04:00
John Eskew
6294766c24 Split emitted signals from the student models file. 2017-10-05 11:12:50 -04:00
Sofiya Semenova
34e3ec6afe Ed-1315 part 2, removing progress message entirely and replacing with another 2017-10-05 11:06:22 -04:00
Nimisha Asthagiri
daf040986c Merge pull request #16170 from edx/naa/course-grade-report-three 
Grade reports: eliminate CSM calls, user-transformed structures
 2017-10-05 10:09:32 -04:00
Diana Huang
ef5670f29a Merge pull request #16153 from edx/diana/disappear-message 
Make the welcome message disappear after seven days of first viewing.
 2017-10-05 10:08:22 -04:00
Douglas Hall
1d1bd3ffa4 Merge pull request #16156 from open-craft/haikuginger/enterprise-0.50.1 
[ENT-649] Update Enterprise to 0.50.1
 2017-10-05 08:53:00 -04:00
Ned Batchelder
5df93d7f15 Use nicer .rst for testing.rst 2017-10-05 06:55:37 -04:00
rabiaiftikhar
ee558581e2 EDUCATOR-139 Add charset to the WebOb response 2017-10-05 15:36:49 +05:00
Nimisha Asthagiri
b5435e6f5a Course Grade reports: eliminate CSM calls, user-transformed structures 
EDUCATOR-558
 2017-10-05 01:12:49 -04:00
Nimisha Asthagiri
09b235bcca Merge pull request #16162 from edx/naa/course-grade-report 
Have SubsectionGrade compute problem_scores lazily
 2017-10-04 20:00:05 -04:00
Tyler Hallada
f0f5ebb3c7 Merge pull request #16139 from edx/thallada/doc-pytest-ddtdata 
Document how to run @ddt.data methods with pytest
 2017-10-04 17:35:21 -04:00
Brian Mesick
473c682a2e Merge pull request #16134 from edx/bmedx/upgrade_i18n-tools_0.3.10 
Add zh_HANS language mapping to locale config
 2017-10-04 14:44:38 -04:00
Attiya Ishaque
cd7a004c4e Merge pull request #16158 from edx/attiya/update-edx-proctoring 
Update edx-proctoring to 1.2.3
 2017-10-04 22:39:42 +05:00
Diana Huang
eab6363d94 Make the welcome message disappear after sevent days of first viewing. 2017-10-04 13:30:03 -04:00
Bill Filler
5d087bfe73 Merge pull request #16163 from edx/bfiller/fix-dsc-banner 
Display banner if user declines data sharing consent
 2017-10-04 12:33:47 -04:00
Bill Filler
5268588980 Display banner if user declines data sharing consent 
Revert changes for getting enterprise customer from enteprise from
Enterprise API and update/add test.
Lookup the enterprise_customer_uuid based on the site and user if not
found through the cookie or request parameter.
 2017-10-04 11:27:16 -04:00
Clinton Blackburn
8a5782eb6e Updated Studio API to expose course run pacing type 
The pacing type can now be read and updated.

EDUCATOR-1464
 2017-10-04 10:16:45 -04:00
Nimisha Asthagiri
33428519aa Have SubsectionGrade compute problem_scores lazily 2017-10-04 09:56:27 -04:00
attiyaishaque
a7e5d43f54 Update edx-proctoring to 1.2.3. 2017-10-04 12:32:26 +05:00
Jesse Shapiro
bf19ecf0dd Update Enterprise to 0.50.1 2017-10-03 22:37:13 -04:00
Brian Mesick
612c99ba3c Merge pull request #16130 from edx/bmedx/django-oauth-plus_PLAT-1743 
Change django-oauth-plus to use Github repo for Django 1.11 compat
 2017-10-03 16:51:31 -04:00
Nimisha Asthagiri
10171bbfd1 Merge pull request #16149 from edx/naa/grade-report 
Optimize grade reports for ZeroCourseGrades
 2017-10-03 16:39:31 -04:00
Tyler Hallada
9d7c3f92c1 Spelling mistake fix 2017-10-03 16:12:11 -04:00
Andy Armstrong
ace9a4fc78 Merge pull request #16143 from edx/andya/verification-availability-message 
Display course home message for certificate availability
 2017-10-03 15:08:01 -04:00
Andy Armstrong
c13b531eeb Display course home message for certificate availability 
LEARNER-2182
 2017-10-03 14:06:11 -04:00
Douglas Hall
dafb07a706 Merge pull request #16151 from edx/douglashall/upgrade_enterprise_0_50_0 
Upgrade edx-enterprise to 0.50.0.
 2017-10-03 14:02:31 -04:00
Farhanah Sheets
3f929bdb75 Merge pull request #16141 from edx/fsheets/ora-update 
Version bump edx-ora2 2.1.2
 2017-10-03 13:52:26 -04:00
Troy Sankey
3036013388 Merge pull request #16150 from edx/pwnage101/remove-django.utils.unittest-PLAT-1551 
remove uses of django.util.unittest
 2017-10-03 13:46:21 -04:00
Douglas Hall
5481bbf53f Upgrade edx-enterprise to 0.50.0. 
https://github.com/edx/edx-enterprise/compare/0.48.2...0.50.0
 2017-10-03 12:12:56 -04:00
Troy Sankey
7f394cfce8 remove uses of django.util.unittest 
django.util.unittest was deprecated in django 1.7 and removed in 1.9.

PLAT-1551
 2017-10-03 11:51:28 -04:00
Tyler Hallada
3a8ca1aa3b RST is confusing 2017-10-03 11:49:12 -04:00
Tyler Hallada
352a652d11 Address PR comments 2017-10-03 11:46:41 -04:00
Clinton Blackburn
f4c08bbca1 Fixed Studio API bug with course team updates 
The org field is now set on the CourseAccessRole object, since Studio expects that value to be present.

LEARNER-2469
 2017-10-03 11:38:38 -04:00
Clinton Blackburn
5139b570ee Removed duplicated override of update_team method 
LEARNER-2469
 2017-10-03 11:38:38 -04:00
Nimisha Asthagiri
27229a1f9b Optimize grade reports for ZeroCourseGrades. 
EDUCATOR-558
 2017-10-03 11:35:32 -04:00
Nimisha Asthagiri
0b1d22f0b4 Merge pull request #16084 from edx/naa/grades-test-cleanup 
Grades: Clean up
 2017-10-03 11:33:21 -04:00