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

2373 Commits

Author SHA1 Message Date
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
0b7dbeb520 Update entitlement ordering in dash 2018-07-20 16:38:43 -04: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
noraiz-anwar
06780b2ded add delay in score recalculation on enrollment update 2018-06-25 14:59:09 +05: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
John Eskew
56824d01cc Remove DataDog enrollment submissions using the deprecated offering. 2018-06-21 11:40:40 -04:00
Zia Fazal
70b35d834f Use custom get_current_site method 2018-06-13 15:17:51 +05: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
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
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
Albert (AJ) St. Aubin
842afd5056 Merge pull request #18241 from edx/aj/LEARNER-5145 
Added credit as an option to change_enrollment command
 2018-05-22 08:43:40 -04:00
Albert St. Aubin
1b72974fb8 Added credit as an option to change_enrollment command 2018-05-21 13:14:14 -04:00
Omar Al-Ithawi
73af914cfc Use edx-ace for password reset email 2018-05-21 09:49:14 -04:00
Troy Sankey
6872671436 Merge pull request #18136 from edx/pwnage101/registration-with-half-retired-user-email 
Disallow registration when the proposed email is retired
 2018-05-18 16:53:30 -04:00
Troy Sankey
a7ecfe1cd3 Fixup! refactor email_exists, and handle many more cases 2018-05-18 15:34:35 -04:00
Dmitry Gamanenko
7992d43009 Merge branch 'master' of https://github.com/edx/edx-platform into dgamanenko/fix_username_missing_field 2018-05-18 09:46:24 +03:00
Jillian Vogel
8b9b158adb Fixes test failures 
(cherry picked from commit 4af929fb8b)
 2018-05-18 09:33:23 +09:30
Jillian Vogel
37ed10103c Shows the account activation message in the main content area 
if HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED is enabled.

(cherry picked from commit 761acdfc6d)
 2018-05-18 09:33:16 +09:30
Jillian Vogel
306b49c36d Adds EMPTY_DASHBOARD_MESSAGE Site Configuration flag 
When set, displays the configured text/markup under "You are not enrolled in any courses yet."

Adjusts left/right padding on .empty-dashboard-message to keep our extra message from hitting the sides.

(cherry picked from commit e417c5f8c2)
 2018-05-18 09:33:09 +09:30
Jillian Vogel
d489ffe7ad Adds HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED 
Site Configuration and feature flag

When set, it hides the Courses list on the Learner Dashboard page if the
learner has not yet activated their account.

(cherry picked from commit 22ee400b15)
 2018-05-18 09:33:02 +09:30
Jillian Vogel
d585294f50 Shows the account activation message in the sidebar 
and removes the DISPLAY_ACCOUNT_ACTIVATION_MESSAGE_ON_SIDEBAR flag, since this
feature is now always on.

Marks the top banner as deprecated.

(cherry picked from commit b44114d171)
 2018-05-18 09:32:54 +09:30
Michael Youngstrom
e8f6d20119 Revert "Learner Dashboard improvements to assist with the Account Activation process" 2018-05-17 14:55:35 -04:00
Albert (AJ) St. Aubin
1bb20d2922 Merge pull request #15464 from open-craft/jill/empty-dashboard-message 
Learner Dashboard improvements to assist with the Account Activation process
 2018-05-17 12:45:02 -04:00
Troy Sankey
232b359258 Fixup! pivot to treating retired emails as banned forever 2018-05-16 16:44:02 -04:00
Troy Sankey
e9276ba246 Disallow registration when the proposed email is half-retired 
Our learner retirement implementation shall allow re-use of email
addresses, but we currently do not disallow re-use of emails for
learners whose retirement is still in-progress (i.e. their retirement
state is between PENDING and LMS_COMPLETE inclusive).

The time between a user initiating retirement, and the jenkins job
actually picking up the user and driving their account retirement might
be as long as 1 hour, so this is a serious concern.

Addresses EDUCATOR-2824.
 2018-05-16 16:44:02 -04:00
Ahsan Ulhaq
795222adbc Unpublished course run displaying in entitlements 
LEARNER-5247
 2018-05-15 17:58:13 +05:00
J Eskew
62865599c7 Merge pull request #18154 from edx/jeskew/add_model_for_retired_users 
Refuse password reset for retired users.
 2018-05-14 13:02:53 -04:00