Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,265 Commits 1 Branch 0 Tags
d61ad613c9d3d1aa6319ae9c19fc00317d94a8a2
Commit Graph

1488 Commits

Author SHA1 Message Date
edx-pipeline-bot
95aa2b61ba Merge pull request #14549 from edx/release-mergeback-to-master 
Merge release back to master
 2017-02-22 10:08:23 -05:00
Hasnain
2f1d405146 Set 'created_on_site' UserAttribute on account creation. 
We need to be able to track which site a given user account was created on. This
change will create a UserAttribute model with a key of 'created_on_site' and a value
containing the domain of the site on which the user accounted was created.

WL-977
 2017-02-22 05:12:21 -05:00
Simon Chen
c38de9638c Revert "edx.org/login?next= should not be able to point to an asset" 
This reverts commit bc418c47c5.
 2017-02-17 14:53:57 -05:00
Ned Batchelder
833f82dce9 Merge pull request #14519 from edx/nedbat/idempotent-email-uniqueness-constraint 
An idempotent migration to add an email uniqueness constraint
 2017-02-16 09:58:07 -05:00
Ahsan Ulhaq
bc418c47c5 edx.org/login?next= should not be able to point to an asset 
ECOM-6463
 2017-02-16 14:44:01 +05:00
Ned Batchelder
98b250b66e A new django app for unicorn migrations 2017-02-15 11:40:05 -05:00
Ned Batchelder
04557bbff3 Make this no-op migration be a true no-op. 2017-02-15 07:16:10 -05:00
Ned Batchelder
169414b734 An idempotent migration to add an email uniqueness constraint 2017-02-15 07:16:10 -05:00
Jesse Shapiro
5d068cec1f Merge pull request #14496 from open-craft/haikuginger/remove-consent-from-logistration 
[ENT-173] Remove data sharing consent from logistration
 2017-02-14 11:51:53 -05:00
Ned Batchelder
1e6a74e777 No-op a migration that needs to be more clever 2017-02-14 10:01:03 -05:00
Douglas Hall
3055f9b259 Merge pull request #14339 from edx/hasnain-naveed/program-backend/WL-912 
WL-766 Program marketing page data layer
 2017-02-14 04:53:53 -05:00
Hasnain
41f3bba058 Backend code for program detail page. 
This adds functions to the catalog utils which munge data
collected from the program endpoint and LMS database to construct
data structures that are ready for use by view and templates
related to the Open EdX marketing pages that live in LMS.

WL-766
 2017-02-13 20:37:56 -05:00
Douglas Hall
58f0154ee2 Add support for multi-org sites 
WL-926
 2017-02-13 19:33:47 -05:00
Ayesha Baig
61f2067935 [YONK-513]: Add feature flag which allows for disabling of account creation 2017-02-13 12:28:57 +05:00
Ahsan Ulhaq
d141eb15b1 Added unique constraint on email 
ECOM-7085
 2017-02-10 21:24:15 +05:00
Renzo Lucioni
0e06e90599 Finish transition to catalog for program data 
Updates Mako and Underscore templates as well as Backbone models and views so they work with catalog programs. Removes all remaining response munging from the back end.

ECOM-4422
 2017-02-09 14:51:26 -05:00
Jesse Shapiro
358e73c082 Remove data sharing consent from logistration 2017-02-08 13:04:54 -05:00
Renzo Lucioni
9be3191829 Merge pull request #14462 from edx/renzo/programs-from-catalog 
Load all programs from the catalog
 2017-02-07 10:42:17 -05:00
Renzo Lucioni
e7771148b7 Load all programs from the catalog 
This commit contains back end changes necessary to load programs from the catalog in all contexts. The existing program munging utility is applied as late as possible to avoid conflating this work with changes to the front end; those will be made separately.

ECOM-4422
 2017-02-06 23:16:29 -05:00
David Ormsbee
da5a8b5540 New Relic metric: Enrolled courses on dashboard. 
This is so we can better map how student dashboard performance maps to
number of enrolled courses.
 2017-02-06 11:24:14 -05:00
Clinton Blackburn
1189867dd2 Removed references to ECOMMERCE_API_SIGNING_KEY 
We should not be using custom signing keys for each service at this time. We may want to return to this strategy in the future; but, this is not the direction any of our other services are going in.

ECOM-6541
 2017-02-01 01:51:21 -05:00
Vedran Karacic
7fe8e47554 [SOL-2133] Add user deactivation endpoint. 2017-01-31 11:34:26 +00:00
Renzo Lucioni
4c9066cf4e Use switch to pull programs from the catalog for the student dashboard 
ECOM-4422
 2017-01-23 15:57:59 -05:00
Afzal Wali
e44e18592f Programs list conditionally added to the context of index and courses page. 2016-12-15 18:16:48 +05:00
noraiz-anwar
5207e2fc91 Remove access for inactive users 2016-12-14 14:26:11 +05:00
Jesse Shapiro
fc814aee95 Add data sharing consent features for EnterpriseCustomer 2016-12-12 09:30:38 -05:00
Nimisha Asthagiri
e87388e24c Grades cleanup before updating grade report 
Remove deprecated SingleSectionGrader.  TNL-5987
Remove display_name and module_id from Scores objects
Update CourseGradeFactory.__init__ to not be user-specific
Update some callers to use CourseGrade class instead of "summary" dict
Remove no longer needed course_grades.py module.
Renamed django signal from GRADES_UPDATED to COURSE_GRADE_CHANGED
 2016-11-30 12:36:25 -05:00
Toby Lawrence
205ded9918 Merge pull request #14068 from edx/release 
Merge release back into master
 2016-11-30 08:06:26 -05:00
Toby Lawrence
6cdb417019 Merge pull request #13879 from open-craft/haikuginger/disable-ccx-studio 
Remove access to CCX courses from Studio
 2016-11-28 15:44:29 -05:00
Qubad786
05ad083ae0 remove transaction.atomic decorator 2016-11-28 01:43:42 +05:00
Calen Pennington
ac2b5bccf2 Merge pull request #13717 from open-craft/smarnach/anonymous-id 
Allow to store multiple anonymous ids per (user, course)
 2016-11-22 10:11:40 -05:00
Douglas Hall
1c8e859b51 Allow for LinkedIn add to profile cert name override 2016-11-21 12:33:33 -05:00
Clinton Blackburn
d7a7bcc1d7 Setting user info cookie on learner dashboard 
The user info is now updated every time a user loads the learner dashboard. Given that this is the page most learners land on after enrolling in a course, updating this cookie here will ensure that the enrollment status hash is relatively up-to-date.

ECOM-4895
 2016-11-18 13:56:48 -05:00
Clinton Blackburn
f0030334af Added enrollment hash to login cookie 
This will allow the marketing site to determine if locally-stored enrollment data needs to be refreshed.

ECOM-4896
 2016-11-18 13:56:48 -05:00
J. Cliff Dyer
b796ba1900 Add missing migrations 2016-11-17 12:11:25 -05:00
Sven Marnach
f5d556e745 Allow to store multiple anonymous ids for each (user, course). 2016-11-14 12:55:00 +01:00
Douglas Hall
3224c027e3 Merge pull request #13955 from edx/ibrahimahmed443/WL-669-education-dropdown-capitalization 
fix inconsistent capitalization in education drop down
 2016-11-10 05:46:00 -05:00
Douglas Hall
92995b42ec Merge pull request #13935 from edx/douglashall/WL-798 
WL-798 Allow for hiding course mode banners on student dashboard
 2016-11-09 14:36:04 -05:00
Douglas Hall
ec7245537a Allow for not showing course modes on student dashboard 2016-11-09 11:39:29 -05:00
Ibrahim
122f718ce5 fix inconsistent capitalization in education drop down 2016-11-09 14:58:15 +05:00
John Eskew
cd522358f2 Merge pull request #13706 from edx/jeskew/move_embargo_out_of_common 
Move embargo from common to openedx/core/djangoapps.
 2016-11-08 14:38:24 -05:00
sanfordstudent
8ffc9197e8 Merge pull request #13881 from edx/efischer/tnl-5314 
Dashboard Final Grade Updates
 2016-11-07 16:08:06 -05:00
Sanford Student
54df702630 Dashboard final grade display uses PersistedCourseGrade 
Will fall back to stored certificate grade if needed as we've discussed.

TNL-5314
 2016-11-07 14:00:27 -05:00
John Eskew
e3cb462d18 Move embargo from common to openedx/core/djangoapps. 2016-11-07 08:47:36 -05:00
attiyaishaque
0ffde1a620 ECOM-5281 Adding retries and celery task for sending activation email. 2016-11-07 11:23:43 +05:00
Toby Lawrence
2acb4a6cad [PERF-386] Utilize ForumsConfig to enable and disable forums. 
This specifically enables/disables the underlying comment service client
used to make calls to the service.  When disabled, this client will now
throw an exception which can be propagated upwards so that callers can
make the right decision about how to notify users of the error, or
handle retry, etc etc.
 2016-11-03 10:20:19 -04:00
Jesse Shapiro
088dab365a Review changes 2016-11-01 13:04:09 -04:00
Jesse Shapiro
bd9f859419 Fix the stupid errors that copy-paste makes for 2016-11-01 11:12:54 -04:00
Jesse Shapiro
fa7c80b40a Remove access to CCX courses from Studio entirely and test that revocation 2016-11-01 09:55:45 -04:00
Ahsan Ulhaq
c9676e4835 Merge pull request #13829 from edx/ahsan/ECOM-6185-errors-during-password-reset 
errors during password reset
 2016-10-27 18:45:33 +05:00