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

261 Commits

Author SHA1 Message Date
John Eskew
2cd62c7bfb Upgrade django-rest-framework version to edX fork, which is DRF v3.6.3 
with a custom patch needed by edx-platform.
Upgrade django-filter as well to v1.0.4
Import DjangoFilterBackend from the correct module - django_filter.
Add django-filter to INSTALLED_APPS.
 2017-07-14 16:05:13 -04:00
Aamish Baloch
ac45850d15 YONK-691: Configurable profile image sizes 2017-07-05 18:50:01 +05:00
Omar Al-Ithawi
1b46c3e646 Add optional support for Unicode usernames 
Refactoring: Use format with named variables
 2017-06-27 14:18:49 +03:00
Sven Marnach
3460adc824 Merge pull request #14831 from open-craft/smarnach/immutable-emails 
Add feature flag to disable email address changes.
 2017-06-26 16:49:52 +02:00
Jesse Shapiro
5d363df5f5 Allow lower- and mixed-case country default values 2017-06-23 11:29:11 -04:00
Sven Marnach
f127a29d62 Add feature flag to disable email address changes. 2017-06-21 15:15:52 +02:00
Uman Shahzad
8b65ca17c5 Migrate to latest, split python-social-auth. 
PSA was monolothic, now split, with new features, like
a DB-backed partial pipeline. FB OAuth2 version also upped.

Partial pipelines don't get cleared except when necessary.
They persist for special cases like change of browser while
still mid-pipeline (i.e. email validation step).

Refactor, cleanup, and update of a lot of small things as well.

PLEASE NOTE the new `social_auth_partial` table.
 2017-06-20 22:05:36 +05:00
Uman Shahzad
d5c85331c5 Automatically populate additional fields for SSO scenarios. 
When authenticating using an SAML IdP, gather additional user
data besides what is standard. Requires admin to input JSON
in settings to recognize the additional user data.
 2017-06-18 22:18:43 +00:00
Brandon Baker
7d2d0657fe Merge pull request #15290 from edx/bbaker/educator-344 
Bbaker/educator 344
 2017-06-13 10:42:35 -04:00
Brandon Baker
f4c9044d2e EDUCATOR-344 
Removed instances of track function
 2017-06-09 18:51:10 +00:00
Sofiya Semenova
6acc6fde95 ED-367 log in production 2017-06-08 18:48:26 +00:00
Brandon Baker
ec9ad2ccb2 EDUCATOR-344 
Change event emission for random partition scheme assignment
 2017-06-07 17:02:58 +00:00
Shirley He
e61f8b62d8 ENT-385 fix confirmation error message 2017-06-01 13:22:36 +00:00
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
John Eskew
3b57542ab0 Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance" 
This reverts commit f97f052591, reversing
changes made to 800bcd8e20.
 2017-05-30 12:42:54 -04:00
John Eskew
76389d8678 Run all files touched in inheritance/partition work through isort. 2017-05-25 13:24:08 -04:00
John Eskew
66f3aa5ccf Move fields.py, inheritance.py, and partitions to openedx/core. 2017-05-25 13:24:08 -04:00
Brittney Exline
69d85dc103 Merge pull request #14985 from open-craft/jill/update-registration-login 
ENT-332/ENT-333 Updates Register and Login as per new design
 2017-05-12 11:07:10 -04:00
Jillian Vogel
71ba54a963 Updates combined Register, Login, and Password Reset views as per new design 
* Reorders form fields, and updates labels, placeholders, and tip text
* Increases clickable area for links and labels.
* Removes "*" markers from required fields, and instead adds
  "(optional)" labels to visible optional fields.
* Updates font colors and sizes, and removes box shadows
* Adds custom drop-down styles
* Improves responsive design scaling for small screens
* Make Terms of Service and Honor Code open in new window to avoid losing form
  field values.
 2017-05-12 09:18:36 -04:00
Nimisha Asthagiri
adb88e21f3 Bulk-reads and Request caching in Course Grade Report 
This reverts commit 5388d5d1fc.
 2017-05-10 17:14:29 -04:00
Sanford Student
5388d5d1fc Revert "Bulk-reads and Request caching in Course Grade Report" 
This reverts commit 16e9636513.
 2017-05-09 16:25:46 -04:00
Nimisha Asthagiri
3491837e9c Merge pull request #15036 from edx/neem/bulk-read-grade-report 
Bulk-reads and Request caching in Course Grade Report
 2017-05-09 10:53:01 -04:00
Nimisha Asthagiri
16e9636513 Bulk-reads and Request caching in Course Grade Report 2017-05-09 08:58:49 -04:00
Matt Drayer
5e94c63da6 mattdrayer/ENT-318: Update activation email subject and message text 2017-05-06 00:16:43 -04:00
Diana Huang
e12a704cea Add new course dates fragment. 
Also add it to the course home page.
 2017-05-04 20:53:42 -04:00
Eric Fischer
f3da0eb5de Implement a naive PartitionScheme for ICRV 2017-05-03 15:21:27 -04:00
Calen Pennington
2ca367a147 Extract some common logic about dirty serializers into a helper method 2017-04-28 16:10:22 -04:00
Calen Pennington
0ca11f6428 Add a trailing comma to make future diffs cleaner 2017-04-28 15:40:46 -04:00
Calen Pennington
1c78d7c02e Remove a stray maxDiff = None 2017-04-28 15:17:05 -04:00
Calen Pennington
1811f7235f Minimize the number of queries done while noop updating a user-preference 2017-04-28 12:26:41 -04:00
Calen Pennington
20caf52bea Use the existing user object in the case where a user is making changes to their own preferences 2017-04-28 12:26:39 -04:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 65f13ddec4.
 2017-04-27 09:25:02 -04:00
edx-pipeline-bot
38c0fbd638 Merge pull request #14975 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-26 15:29:32 -04:00
Calen Pennington
65f13ddec4 Revert "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 88dd85caec, reversing
changes made to bf8aef33fc.
 2017-04-26 11:29:56 -04:00
Brittney Exline
2b48a5e7c5 Merge pull request #14920 from edx/bexline/registration_email 
ENT-304 Add confirm email field to registration
 2017-04-26 07:59:29 -04:00
Brittney Exline
c2df64c3f8 ENT-304 Add confirm email field to registration 2017-04-25 18:35:29 +00:00
Calen Pennington
4cc23bc641 Attempt to reduce the number of database calls for user_api serialization 2017-04-24 07:37:19 -04:00
Calen Pennington
0c82bae91c Add the caller to user_api caught error logging 2017-04-24 07:37:19 -04:00
Eric Fischer
5c26acc115 Re-kill ICRV block 
This reverts commit 1224e341de. I've also added
NotImplementedPartitionScheme, which allows deprecated partition types to have
a valid entry point despite being unusable.

TNL-6675
 2017-04-19 15:55:13 -04:00
Ahsan Ulhaq
04ca94eaef Account settings page should load and create student user profile 
ECOM-4776
 2017-04-13 11:47:38 +05:00
noraiz-anwar
1c0ccb2f61 ECOM-6939 Fixed social auth false password-validation error (adding form field) 2017-03-08 20:16:21 +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
Ayesha Baig
61f2067935 [YONK-513]: Add feature flag which allows for disabling of account creation 2017-02-13 12:28:57 +05:00
Jesse Shapiro
358e73c082 Remove data sharing consent from logistration 2017-02-08 13:04:54 -05:00
Vedran Karacic
036e05964f User deactivation endpoint should use JWT auth. 2017-02-07 14:45:20 +00:00
Vedran Karacic
7fe8e47554 [SOL-2133] Add user deactivation endpoint. 2017-01-31 11:34:26 +00:00
jareerahsan
7baecd3a41 Merge pull request #14317 from edx/jareer/ecom-2963-added-new-fields-in-email-opt-out 
Added username and user_id in opt out email csv.
 2017-01-18 22:26:19 +05:00
J. Cliff Dyer
f33832a691 scoutrule: dedupe skip_unless_lms 2017-01-18 09:43:46 -05:00
cahrens
80ff25f7b9 Remove warnings about WIP API. 2017-01-17 10:10:20 -05:00
Jareer Ahsan
8afc273dec Added username and user_id in opt out email csv. 
ECOM-2963
 2017-01-12 18:21:27 +05:00