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

51562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
a272132eb2 Merge pull request #17962 from edx/jmbowman/fix_github_txt 
Remove merge conflict cruft from github.txt
 2018-04-13 11:34:50 -04:00
Jeremy Bowman
7b0f3195e0 Remove merge conflict cruft from github.txt 2018-04-13 11:33:40 -04:00
Jeremy Bowman
0a65a2ff8a Merge pull request #17927 from edx/jmbowman/PLAT-2060 
PLAT-2060 Use pip-tools to manage requirements files (take 2)
 2018-04-13 10:31:21 -04:00
Nimisha Asthagiri
d0c99dca41 Merge pull request #17921 from edx/douglashall/remove_ccx_usage_of_course_structures 
Remove use of the deprecated course_structures module.
 2018-04-13 09:40:54 -04:00
Ibrahim
a7e1ddf729 catch duplicate course error 2018-04-13 17:34:27 +05:00
Jeremy Bowman
9ca9aa44c6 PLAT-2060 Use pip-tools to manage requirements files (take 2) 
This reverts commit a7fa0c211d.
 2018-04-12 17:22:48 -04:00
Michael Terry
98a13423d1 Drop underscore from learner_dashboard 2018-04-12 15:14:52 -04:00
Bill Filler
b4a9dde0a6 Merge pull request #17947 from edx/bfiller/ora2-2.1.15 
bump ora2 release to 2.1.15 to fix EDUCATOR-2634
 2018-04-12 14:17:38 -04:00
Bill Filler
55a8ce2171 bump ora2 release to 2.1.15 to fix EDUCATOR-2634 2018-04-12 14:13:31 -04:00
McKenzie Welter
f813a56d05 Merge pull request #17931 from edx/McKenzieW/learner-3923 
mark support (re)issued entitlements as unrefundable
 2018-04-12 14:06:21 -04:00
Diana Huang
700a4d8e19 Merge pull request #17915 from edx/diana/new-auth-endpoint 
LEARNER-4882: Create new auth endpoint for checking user password.
 2018-04-12 13:17:54 -04:00
Farhanah Sheets
b613494a0a Merge pull request #17907 from edx/fsheets/tinymce-align 
Add alignment options to the TinyMCE platform plugin
 2018-04-12 13:16:15 -04:00
Diana Huang
8056d89f9a Create new auth endpoint for checking user password. 2018-04-12 12:20:41 -04:00
McKenzie Welter
435c3c6338 mark support (re)issued entitlements as unrefundable 2018-04-12 12:16:37 -04:00
Jeff LaJoie
c3bb21c714 Merge pull request #17904 from edx/jlajoie/LEARNER-4578 
LEARNER-4578: Adds in JQuery password validation on Studio
 2018-04-12 12:12:56 -04:00
Uman Shahzad
6dcf3ca7b0 Merge pull request #17910 from edx/uman/show-enterprise-displayname 
[ENT-924] Replace sensitive SSO usernames with generic Enterprise displayname
 2018-04-12 20:20:18 +05:00
Michael Youngstrom
f968729f91 Merge pull request #17939 from edx/testeng/bokchoy_auto_cache_update_41cf5bc005c4a258207e87677b0f85c1b47008b5 
Bokchoy db cache update
 2018-04-12 10:24:44 -04:00
Uman Shahzad
d58bd06928 Show Enterprise display name if we should hide sensitive username. 2018-04-12 19:10:30 +05:00
edx-cache-uploader-bot
46d14c233c Updating migrations 2018-04-12 09:49:32 -04:00
Waheed Ahmed
7711387e55 Merge pull request #17937 from edx/waheed/LEARNER-4426-fix-500-error-on-new-contact-us-form 
Fix 500 error on new contact us form.
 2018-04-12 18:18:05 +05:00
irfanuddinahmad
e424e04897 Merge pull request #17605 from edx/iahmad/migrate_transcripts_S3 
Iahmad/migrate transcripts s3
 2018-04-12 17:45:08 +05:00
irfanuddinahmad
3e426aca91 New command to migrate transcripts to S3 2018-04-12 16:57:23 +05:00
Waheed Ahmed
ce7e144088 Fix 500 error on new contact us form. 
If learner has enrollments without course overview object server raises
error, fixed using course_overview property of course enrollment.

LEARNER-4426
 2018-04-12 16:10:18 +05:00
Uzair Rasheed
c3481a519d Merge pull request #17924 from edx/LEARNER-4048/edits-to-email-photo-submission 
Edit email acknowledging photo-submission
 2018-04-12 15:35:31 +05:00
Noraiz Anwar
bbd065ef2e Merge pull request #17934 from edx/noraiz/EDUCATOR-2682 
fetch poll component to check for completion
 2018-04-12 15:27:12 +05:00
uzairr
ad7fb01883 Edit email acknowledging photo-submission 
To add more context,content of the acknowledging
email of photo-submission is updated so that a learner aware of
the whole process.

LEARNER-4048
 2018-04-12 13:48:52 +05:00
uzairr
d85dc4532e Send verification email status 
Support Team need to handle bulk of tickets every month about the
verification status of learners.To avoid it,suitable changes have
done to send verification email to the learner.

LEARNER-1487
 2018-04-12 11:47:49 +05:00
noraiz-anwar
ef84f2a81f fetch poll component to check for completion 2018-04-12 11:30:11 +05:00
Douglas Hall
a2f5210969 Updates after review feedback. 2018-04-11 16:04:54 -04:00
George Babey
e8469a45aa Merge pull request #17925 from edx/saleem-latif/ENT-955 
ENT-955: Fixed 500 error when adding viewers to catalog.
 2018-04-11 14:16:16 -04:00
Brittney Exline
3bab72cfa0 Merge pull request #17888 from edx/astankiewicz/sso_id_verification 
ENT-943 Refactor ID verification models
 2018-04-11 11:09:43 -06:00
Brittney Exline
3f3f8699a4 Merge pull request #17911 from edx/bexline/tpa_model_cleanup 
ENT-943 Cleanup of old third_party_auth provider slug fields
 2018-04-11 10:56:07 -06:00
Douglas Hall
4d72d9caae Remove use of the deprecated course_structures module. 2018-04-11 12:54:14 -04:00
Adam Stankiewicz
d0585be144 ENT-943 refactor PhotoVerification model 2018-04-11 11:21:28 -04:00
Saleem Latif
d2c97d6402 Fix 500 error when adding viewers to catalog. 2018-04-11 14:49:03 +05:00
Joel Barciauskas
caf9901c1b [PLAT-1109] Suppress IntegrityErrors caused by race condition 
Suppress IntegrityErrors that may be caused by a race condition
between processes resulting from a slow-loading page and a user refreshing the
page.
 2018-04-11 13:47:11 +05:00
Farhanah Sheets
d8d7e33879 Merge pull request #17905 from edx/fsheets/sfe-search-cleanup 
Remove Studio Assets Search Waffle & Add test
 2018-04-10 17:14:21 -04:00
Farhanah Sheets
752cf12938 Add align buttons to test check 2018-04-10 17:10:05 -04:00
Farhanah Sheets
c29682a6a5 Add alignment options to the TinyMCE platform plugin 2018-04-10 17:10:05 -04:00
McKenzie Welter
c6064e1c5b Merge pull request #17906 from edx/McKenzieW/learner-4893 
move Create Entitlement button up and shrink username search bar
 2018-04-10 17:05:49 -04:00
mduboseedx
881182d176 Merge pull request #17886 from edx/mduboseedx/bulk_email_courseauth_description_fix 
Correct mention of old course ID format in the description for Course Authorization Bulk Email tool
 2018-04-10 16:36:39 -04:00
Matthew DuBose
a24d892e9c correct mention of old course ID in description of bulk email django tool 2018-04-10 15:42:07 -04:00
McKenzie Welter
300427be3f move Create Entitlement button up and shrink username search bar 2018-04-10 14:54:33 -04:00
Feanil Patel
87573dc26b Merge pull request #17903 from edx/feanil/update_nr_agent 
Move to the latest python newrelic agent.
 2018-04-10 14:20:29 -04:00
Farhanah Sheets
3e557984e8 Update studio-frontend version 2018-04-10 14:00:32 -04:00
Feanil Patel
0b046d49b9 Merge pull request #17914 from edx/revert-17825-jmbowman/PLAT-2060 
Revert "PLAT-2060 Use pip-tools to manage requirements files"
 2018-04-10 13:53:41 -04:00
Feanil Patel
a7fa0c211d Revert "PLAT-2060 Use pip-tools to manage requirements files" 2018-04-10 12:54:41 -04:00
Brittney Exline
9a86a67ae0 ENT-943 Cleanup of old third_party_auth provider slug fields 2018-04-10 09:58:31 -04:00
Jeremy Bowman
cce91d6b34 Merge pull request #17825 from edx/jmbowman/PLAT-2060 
PLAT-2060 Use pip-tools to manage requirements files
 2018-04-09 18:50:51 -04:00
Jeremy Bowman
432347b881 PLAT-2060 Use pip-tools to manage requirements files 2018-04-09 17:07:02 -04:00