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

42901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sofiya Semenova
dbfdff090d Checking if CAD exists before using it 2017-10-06 13:24:56 -04:00
adeel khan
27a73f77da Merge pull request #16124 from edx/adeel/LEARNER_2607_untranslatedtooltip_progresstab_chart 
Adds translation for lms progress chart tooltip.
 2017-10-06 19:28:02 +05:00
Bill Filler
f4a00bda0a Merge pull request #16181 from edx/bfiller/WL-1241 
bump edx-enterprise version to 0.51.0
 2017-10-06 10:25:42 -04:00
Robert Raposa
91bf523920 Merge pull request #16175 from edx/robrap/LEARNER-2026-clean-up 
LEARNER-2026: Revert remains of 'upgrade upsell to course info banner'.
 2017-10-06 10:02:49 -04:00
Adeel Khan
9ef887c547 Adds translation for lms progress chart tooltip. 
Tooltip text under lms->courseview->progress tab->chart
was not under any translation, causing it to appear untranslated for
learners. This would enable its translation to any language.

LEARNER-2607
 2017-10-06 18:32:02 +05:00
Jesse Shapiro
b96f646d35 Merge pull request #16178 from open-craft/haikuginger/remove-unnecessary-ent-enrollment 
[ENT-606] Remove unused generic Enterprise-related enrollment logic
 2017-10-06 08:59:32 -04:00
Bill Filler
dd16bf7685 bump edx-enterprise version to 0.51.0 2017-10-05 17:14:28 -04:00
Robert Raposa
e8945ebdc5 Course home event clean-up. 
- Convert hero events to BI events.
- Upgrade click event clean-up

LEARNER-2026
 2017-10-05 15:29:37 -04:00
Jesse Shapiro
f160980008 Remove unused generic Enterprise-related enrollment logic 2017-10-05 14:47:21 -04:00
Harry Rein
747611eaca Merge pull request #16168 from edx/HarryRein/LEARNER-2332-reviews-speed-up 
Add loading icon to reviews page.
 2017-10-05 14:31:54 -04:00
Robert Raposa
4fa813529b Merge pull request #16169 from edx/robrap/LEARNER-2026-fix-bug 
LEARNER-2026: Fix upgrade event.
 2017-10-05 14:12:13 -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
Robert Raposa
23edd521f4 Fix upgrade event. 
LEARNER-2026
 2017-10-05 11:01:25 -04:00
Robert Raposa
07061caf91 Revert remains of 'upgrade upsell to course info banner'. 
TNL-6381 added an upgrade upsell to course info. In PR #15265, this was
partially removed/moved, but some clean-up work remained.

LEARNER-2026
 2017-10-05 10:54:08 -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
Harry Rein
271f3c9f3c Add loading icon to reviews page. 
LEARNER-2332

Since CourseTalk doesn't allow for loading a read and write reviews
page at the same time, this commit adds a loading icon to show that
we need to grab the iframe.
 2017-10-05 09:18:49 -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