Commit Graph

4418 Commits

Author SHA1 Message Date
mduboseedx
bf5aac7a14 Merge pull request #17477 from open-craft/ciuin/improve-courseenrollment-admin-search-upstream
Improve CourseEnrollment admin search presentation
2018-08-09 10:33:30 -04:00
Jeremy Bowman
02e4b87421 Merge pull request #18733 from edx/jmbowman/TE-2525
TE-2525 nose.tools removal part 1/2
2018-08-07 13:55:04 -04:00
Jeremy Bowman
7e410b0656 TE-2524 Remove remaining nose.plugins usage 2018-08-07 09:36:35 -04:00
Jeremy Bowman
bcaec3c5bb TE-2525 nose.tools removal part 1/2 2018-08-07 08:30:12 -04:00
Daniel Clemente Laboreo
370501d156 Add feature to send an e-mail to staff when a student enrolls 2018-08-02 11:43:17 -04:00
Jillian Vogel
e1dcdd8ed9 Adds test 2018-08-02 13:40:19 +09:30
John Hensley
aeec52a9ae Improve CourseEnrollment admin search presentation
When searching CourseEnrollments in the admin, list the enrollments
whose usernames were an exact match first.
2018-08-02 10:42:15 +09:30
Cole Rogers
2a438df3b1 Merge pull request #18641 from edx/colelrogers/LEARNER-5922-cache-pathways
Add credit pathway caching
2018-08-01 11:13:44 -04:00
Ned Batchelder
74c6c7aa75 Merge pull request #18638 from open-craft/jill/reinstate-enrollments-admin
Gate access to the CourseEnrollmentAdmin view with a waffle switch
2018-08-01 10:35:31 -04:00
Cole Rogers
1c05308d4a Add credit pathway caching 2018-08-01 10:18:10 -04:00
Jeremy Bowman
4241249119 TE-2524 Stop using nose.plugins 2018-07-30 21:11:05 -04:00
J Eskew
3fe348598f Merge pull request #18657 from open-craft/jill/dont-delete-enrollments
Do not delete course enrollments
2018-07-30 11:09:06 -04:00
Ahsan Ulhaq
73857f6039 Added Management command for bulk unenrollment of users
LEARNER-5852
2018-07-30 14:26:46 +05:00
Jillian Vogel
2667c14e19 Fix failing test
and use the self.assert* convention used by the other tests
2018-07-27 13:50:06 +09:30
Jillian Vogel
7a63af9216 Add a test 2018-07-27 11:25:32 +09:30
Jillian Vogel
84eefa0e87 Adds migration 2018-07-27 11:25:32 +09:30
Jillian Vogel
2fd3592586 Do not delete course enrollments
when the associated CourseOverview gets recreated.
2018-07-27 09:26:20 +09:30
Jillian Vogel
c5e90464e9 Address PR review:
* uses openedx waffle_utils instead of straight waffle
* adds student.STUDENT_WAFFLE_NAMESPACE
* improves comment

Also changed the waffle switch to use _ instead of . to respect current conventions.
2018-07-26 13:30:35 +09:30
Jillian Vogel
7f0bbedba1 Adds a waffle switch which gates access to the CourseEnrollmentAdmin views 2018-07-26 13:30:35 +09:30
Bill Filler
df52ff0038 Merge pull request #18395 from edx/whitelabel/journal
Add journals support in LMS
2018-07-23 15:10:38 -04:00
Bill Filler
c746a4e630 Add Journals support
Enable the journal app in LMS. Add support to display Journals on index
and courseware pages and dashboard.
2018-07-23 13:11:26 -04:00
Gregory Martin
df23616046 Merge pull request #18613 from edx/yro/LEARNER-5556
Update entitlement ordering in dash
2018-07-23 10:40:50 -04:00
Waheed Ahmed
4f3d9e7a0c Merge pull request #18600 from edx/waheed/LEARNER-5620-fix-entitlement-unenroll
Fix unenroll entitlement from instructor dashboard.
2018-07-23 18:23:10 +05:00
Gregory Martin
0b7dbeb520 Update entitlement ordering in dash 2018-07-20 16:38:43 -04:00
Waheed Ahmed
2849d8f572 Fix unenroll entitlement from instructor dashboard.
LEARNER-5620
2018-07-19 14:52:23 +05:00
noraiz-anwar
593c2d1ae8 add python getter in capa system 2018-07-18 18:44:56 +05:00
Uzair Rasheed
0c610749c9 Refactor Code for LEARNER-5257
Course key object was not serializable before sending to celery
task.
2018-07-17 18:20:39 +05:00
irfanuddinahmad
ead8a78e29 disabled activation email 2018-07-13 12:48:02 +05:00
Uzair Rasheed
edfdbc7aee Merge pull request #18482 from edx/LEARNER-5257/update-sailthru-audit-purchase
Update sailthru audit purchase calls
2018-07-11 12:01:22 +05:00
Hamza Munir
e00156c277 Learners cannot process there Credit requests even though they are in the Credit mode.
adding "credit mode" in change_enrollment management command to move the user to
credit mode by running this command.

LEARNER-5502
2018-07-09 14:19:33 +05:00
uzairr
d84d47f32c Update sailthru audit purchase calls
Currently, there are two purchase calls are occurring for each audit
purchase on sail-thru.To avoid it,code is updated so that a single
call will occur for each purchase.

LEARNER-5257
2018-07-09 01:09:27 +05:00
Tasawer Nawaz
8868f07394 inactive enrollments in support tool
LEARNER-4744
2018-07-02 19:02:43 +05:00
Calen Pennington
07a15c681f Reapply the XBlock RequireJS -> Webpack changes
This reverts commit 105db2cf59, reversing
changes made to 447457594f.
2018-06-27 22:27:07 -04:00
noraiz-anwar
06780b2ded add delay in score recalculation on enrollment update 2018-06-25 14:59:09 +05:00
Albert (AJ) St. Aubin
85ab2e4036 Merge pull request #18443 from edx/LEARNER-5275
Update the entitlement fulfilment logic to work with enrollment end
2018-06-22 09:59:36 -04:00
Albert St. Aubin
06af818322 Update the entitlement fulfilment logic to work with enrollment end
[LEARNER-5275]

Update the endtitlement fulfillment logic to work for users who have
enrolled, enrollment window has closed, but upgrade window is still
open. These users should be able to use that enrollment on their course
run that they are enrolled in.
2018-06-22 07:48:35 -04:00
J Eskew
64ce2a0d8a Merge pull request #18405 from edx/jeskew/PLAT_2185_idempotent_endpoints
Make retirement endpoints idempotent.
2018-06-21 16:11:06 -04:00
John Eskew
a09a81b138 Make retirement endpoints idempotent. 2018-06-21 15:35:30 -04:00
J Eskew
df16836a8f Merge pull request #18427 from edx/jeskew/fix_some_deprecation_warnings
Fix some deprecation warnings.
2018-06-21 12:24:19 -04:00
John Eskew
56824d01cc Remove DataDog enrollment submissions using the deprecated offering. 2018-06-21 11:40:40 -04:00
Albert St. Aubin
f23fd19e99 Added search fields to the entitlements admin panel 2018-06-21 08:54:07 -04:00
Eric Fischer
e72549cdbe Revert "Merge pull request #18340 from cpennington/fix-studio-xblock-rendering"
This reverts commit 9a70ca78a5, reversing
changes made to efd5b9abbd.

Hopefully fixes EDUCATOR-3053
2018-06-15 13:18:27 -04:00
uzairr
e77a19a4a3 Update UTM params of social sharing buttons
To improve Customer experience small changes have done in the
Google Analytics so that incoming stats are organized efficiently.

LEARNER-5360
2018-06-14 12:38:01 +00:00
Feanil Patel
c96bc8330c Merge pull request #18363 from edx/feanil/update_social_auth
Actually update social auth packages.
2018-06-13 22:25:03 -04:00
Jeremy Bowman
69092ac18b Fix unit tests with latest social-auth-* packages 2018-06-13 17:24:33 -04:00
Calen Pennington
9a70ca78a5 Merge pull request #18340 from cpennington/fix-studio-xblock-rendering
Fix studio xblock failing renders (due to asset hashing loop)
2018-06-13 15:58:34 -04:00
David Ormsbee
386699f7aa Merge pull request #18350 from edx/ormsbee/discussion_map_storage_change
Fix forums ID mapping
2018-06-13 09:06:44 -04:00
David Ormsbee
72ed987dff Enable model-caching of discussions ID mapping.
Doing modulestore lookups is expensive, so commit 695b036 created a
course_publish listener that would materialize the discussion ID to
XBlock usage key mapping into the CourseDiscussionSettings model.

However, the signal wasn't hooked up to the Studio process, so that
async task was never called. When hooking it up, I also discovered that
bok choy tests related to partitioning were failing because of a race
condition where multiple processes are overwriting the discussion
settings. To make sure this wasn't an issue, I moved the mapping to
its own table.

This is part of ARCH-111, and the overall Course Structures API
deprecation.
2018-06-13 08:21:08 -04:00
Zia Fazal
70b35d834f Use custom get_current_site method 2018-06-13 15:17:51 +05:00
Christopher Lee
f6e0c70f41 Finalize rate limit for enrollment API
LEARNER-5166
2018-06-12 15:44:33 -04:00