Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,766 Commits 1 Branch 0 Tags
774e89ed7e8a67d391b0b9355392de986dff01eb
Commit Graph

45766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edX Transifex Bot
774e89ed7e Update translations 2018-04-15 17:27:41 -04:00
Braden MacDonald
e91bff63d5 Merge pull request #17498 (completion-exclude-discussion) 
Added completion mode to discussion XBlock
 2018-04-14 18:43:36 -07:00
Simon Chen
c02c1d5177 Merge pull request #17902 from edx/rm-new-course-outline-waffle 
EDUCATOR 2283 - Removes the new course outline waffle flag.
 2018-04-14 15:07:00 -04:00
Bill DeRusha
f7dd174873 Merge pull request #17954 from edx/bderusha/generated-pw-complexity 
Update and refactor random password generator
 2018-04-13 17:13:55 -04:00
Simon Chen
2a3a828157 Remove the flaky bokchoy test 
We want to unblock this PR from merging.
Created EDUCATOR-2728 to track
 2018-04-13 16:06:25 -04:00
Nimisha Asthagiri
f34af9bf2b Merge pull request #17951 from edx/arch/remove-course-structure-usage-in-course-graph 
Remove CourseStructure usage in CourseGraph
 2018-04-13 15:23:40 -04:00
Jeremy Bowman
07c13c9167 Merge pull request #17966 from edx/jmbowman/TE-2515 
TE-2515 Fix occasional help link test failures
 2018-04-13 15:23:04 -04:00
J Eskew
0269d4a536 Merge pull request #17868 from edx/jeskew/check_for_retired_username 
Reject acct creation when using a retired username.
 2018-04-13 15:15:10 -04:00
Jeremy Bowman
9afa92b075 TE-2515 Fix occasional help link test failures 2018-04-13 14:45:41 -04:00
Nimisha Asthagiri
57ecda7f71 Remove CourseStructure usage in CourseGraph 2018-04-13 14:44:19 -04:00
John Eskew
3f0665b6d6 Fix existing quality errors. 2018-04-13 14:27:42 -04:00
John Eskew
338d4551ab Reject acct creation when using a retired username. 
Change from specifying a retired username/email format to specifying
  a retired username prefix and a retired email prefix/domain,
  preventing possible config errors due to unexpected/bad formats.
 2018-04-13 14:27:21 -04:00
Bill DeRusha
d1ed33ac23 Update and refactor random password generator 2018-04-13 14:17:21 -04:00
John Hensley
37ce467636 Added completion mode to discussion XBlock 2018-04-13 14:14:54 -04:00
Michael Terry
a34c8c8233 Drop remaining coffee use 
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.

A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
 2018-04-13 14:10:40 -04:00
Michael Terry
2abbd1eb83 Move all our coffee files 
This moves the original files into their JS locations so that when
the next commit modifies them, we dont lose history.
 2018-04-13 14:10:40 -04:00
J. Cliff Dyer
964c20252b Add DISABLE_START_DATES setting to CMS 2018-04-13 14:05:45 -04:00
Michael Terry
4bd3033185 Update list of supported browsers 
Update the list of supported browsers in the example about page
template.
 2018-04-13 13:03:34 -04:00
sandroroux
3899b76929 Removes the new course outline waffle flag. 2018-04-13 12:28:14 -04:00
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
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
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