Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
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
Robert Raposa
50f36603f5 Merge pull request #18346 from edx/clee/trottle3 
Change waffle flag for enrollment throttle to switch
 2018-06-08 17:11:33 -04:00
christopher lee
443aa7977c Change waffle flag for enrollment throttle to switch 2018-06-08 15:07:26 -04:00
Calen Pennington
be3c7e05c5 Reapply "Switch container factory to webpack" 
This reverts commit 18d93b00ba.
 2018-06-07 15:52:05 -04:00
Calen Pennington
18d93b00ba Revert "Switch container factory to webpack" 2018-06-07 13:46:47 -04:00
Michael Youngstrom
d6616c9036 Add require_https to all is_safe_url calls 2018-06-07 10:10:28 -04:00
Brian Mesick
ca0ec641db Merge pull request #18329 from edx/bmedx/is_safe_url_allowed_hosts 
Change usages of is_safe_url to use new allowed_hosts instead of host
 2018-06-07 10:06:40 -04:00
bmedx
29ad5fce6f Change usages of is_safe_url to use new allowed_hosts instead of host 
"host" parameter is deprecated and throws a warning
 2018-06-06 14:41:52 -04:00
Calen Pennington
0abe75a7c6 Re-apply the changes to convert XBlocks to Webpack 
Reapplies edx/edx-platform#17509

This reverts commit 0f7e2373d0.
 2018-06-06 12:52:12 -04:00
Michael Youngstrom
f4dc2ca000 Merge pull request #18314 from edx/youngstrom/remove_django_18_shim 
Remove temp django upgrade logic
 2018-06-06 11:09:17 -04:00
Tyler Hallada
1f42d1b384 Merge pull request #18316 from edx/thallada/PLAT-1524-on-delete 
PLAT-1524: Add on_delete kwarg to ForeignKey & OneToOneFields
 2018-06-06 10:38:15 -04:00
Michael Youngstrom
26b4e30833 Remove django 1.8 shim 2018-06-06 10:34:56 -04:00
Tyler Hallada
1540f9ec72 Add on_delete kwarg to ForeignKey & OneToOneFields 
Django 2.0 will make this field required for `ForeignKey` and `OneToOneFields`.
In previous versions the option defaulted to `models.CASCADE` when not
specified. This change should make the deprecation warnings in the current
Django version go away.

The migrations where also modified, but the changes should not cause a change in
the database schema since `models.CASCADE` was already the old default.
 2018-06-05 17:05:12 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g 
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
 2018-06-05 13:59:09 -04:00
Asad Iqbal
1a4ef62f15 Merge pull request #18256 from edx/asadiqbal08/ENT-692 
[ENT-692] Change the log level from Warning to Info
 2018-06-04 11:00:52 +05:00
asadiqbal
30db538e3a Change the log level to info 2018-05-31 19:43:11 +05:00
Ahsan Ul Haq
783aca5559 Merge pull request #17042 from raccoongang/dgamanenko/fix_username_missing_field 
Fix "admin/auth/user/add "username" missing field.
 2018-05-31 14:22:36 +05:00
Zia Fazal
b74cbfb85a Merge pull request #18255 from edx/ziafazal/WL-1388 
WL-1388: Added a base MessageType for ace
 2018-05-30 11:14:04 +05:00
Calen Pennington
0f7e2373d0 Revert "Switch container factory to webpack" 2018-05-29 16:01:38 -04:00
Calen Pennington
6c8e0842cc Merge pull request #17509 from cpennington/switch-container-factory-to-webpack 
Switch container factory to webpack
 2018-05-29 14:27:38 -04:00
Calen Pennington
04a5d3c7c6 Wait for specific javascript variables rather than requirejs loading on the unit page 2018-05-29 12:21:47 -04:00
Calen Pennington
5474ec0a8f Wait for the sock to be ready as a proxy for the Studio header being ready 2018-05-29 12:21:47 -04:00
Calen Pennington
79cd02b001 Convert edit_tabs factory to webpack 2018-05-29 12:21:46 -04:00
Calen Pennington
ee6360543b Convert webpackified factories to es6 modules with global exports, and remove the invoke_page_factory pattern 2018-05-29 12:21:46 -04:00
Calen Pennington
f557bad5a3 Wait for MathJax for tests, rather than MathJax.isReady 2018-05-29 12:19:05 -04:00
Amir Qayyum Khan
2f7643f7d8 more reforting 2018-05-25 15:50:05 +05:00
Amir Qayyum Khan
594a7c4ac6 throwing exception when user has conflict with username or email 2018-05-25 15:50:05 +05:00
Amir Qayyum Khan
92e224f002 Fixed code to include special characters in username 2018-05-25 15:50:05 +05:00
Zia Fazal
f2ea2ca360 Added a base MessageType for ace 
added unit tests

updated edx-ace version

fixed quality violations

Fixed quality violations

Changed ACEMessageType to BaseMessageType
 2018-05-25 10:52:33 +05:00
Christopher Lee
ac6ddd8473 Merge pull request #18224 from edx/clee/addthrottletest 
Added enrollment API test for throttle rates
 2018-05-23 09:37:32 -04:00