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

45795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rabia Iftikhar
648b13dc47 Merge pull request #17490 from edx/aj/updated-and-rescored-problem-still-shows-red-X 
updated correct map when new score is calculated
 2018-04-18 19:07:33 +05:00
Attiya Ishaque
44ccd84c7a Merge pull request #17975 from edx/ai/EDUCATOR-2719-button-styling 
Fix styling of button on certificate & membership page.
 2018-04-18 17:32:59 +05:00
Nimisha Asthagiri
0f29ca2620 Merge pull request #17968 from edx/arch/remove-course-structure-usage-in-completion 
Remove Completion's usage of Course Structures API
 2018-04-18 08:03:25 -04:00
Zia Fazal
a9693f4ad6 Merge pull request #17815 from edx/hasnain-naveed/WL-1518 
WL-1518 | Get decline notification context from enterprise.
 2018-04-18 15:54:57 +05:00
Awais Jibran
bef0eb1135 updated correct map when new score is calculated 2018-04-18 15:13:25 +05:00
Hasnain
3fca1af171 WL-1518 | Get decline notification context from enterprise. 2018-04-18 15:00:47 +05:00
Uzair Rasheed
e0d20be11d Merge pull request #17912 from edx/LEARNER-1487/send_successfull_verification_email 
Send verification email status
 2018-04-18 12:09:42 +05:00
Nimisha Asthagiri
fd078ae1f5 Remove Completion's usage of Course Structures API 2018-04-17 21:13:39 -04:00
Jae Bradley
769ca45f42 Merge pull request #17941 from edx/LEARNER-4864-cookie-policy-banner-component 
LEARNER-4864: Add Cookie Policy Banner
 2018-04-17 17:50:25 -04:00
jaebradley
fab388ad6b add cookie policy banner with feature flag 2018-04-17 16:48:52 -04:00
Feanil Patel
139ac68ad3 Merge pull request #17981 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-17 16:31:04 -04:00
Michael Youngstrom
a6f77926f5 Merge pull request #17980 from edx/youngstrom/remove-failing-js-test 
Remove failing js test on ff59
 2018-04-17 14:36:23 -04:00
Michael Youngstrom
2e108357b5 Remove failing js test 2018-04-17 14:17:33 -04:00
Feanil Patel
aa46a245b0 Merge pull request #17967 from edx/gbabey/revert-ENT-924 
Revert "Show Enterprise display name if we should hide sensitive user…
 2018-04-17 12:58:57 -04:00
Attiya Ishaque
90b1b40ae9 Merge pull request #17972 from edx/ai/EDUCATOR-2692-discussion 
Discussion moderators, TA's ,admins see the posts according to cohorts.
 2018-04-17 19:57:38 +05:00
Alex Dusenbery
f6997f2842 Remove unused imports in user_api.models 2018-04-17 10:03:05 -04:00
George Babey
a155aad01c Revert "Show Enterprise display name if we should hide sensitive username." 
This reverts commit d58bd06928.

This commit caused performance issues due to increased API load from checking the
enterprise association on each page load
 2018-04-17 09:07:17 -04:00
attiyaishaque
9abdd0af3d Discussion moderators, TA's and admins see the posts according to cohorts. 2018-04-17 15:05:26 +05:00
Mushtaq Ali
03c9d45b3b Merge pull request #17589 from edx/mushtaq/import-transcripts 
Import video transcripts
 2018-04-17 13:42:05 +05:00
Mushtaq Ali
d6e3474ad7 VAL version bump 2018-04-17 12:52:31 +05:00
attiyaishaque
9dc01647e8 Fix styling of button on certificate & membership page. 2018-04-17 12:21:09 +05:00
Waheed Ahmed
0f9db0cb89 Merge pull request #17957 from edx/waheed/LEARNER-4965-fix-program-logos 
Fix program type logos.
 2018-04-16 13:38:21 +05:00
Waheed Ahmed
544f7faa0d Fix program type logos. 
file-loader just providing the file name and underscore printing it's
name instead of content.

LEARNER-4965
 2018-04-16 12:54:56 +05:00
Mushtaq Ali
5a9477af30 Import video transcripts - EDUCATOR-2173 2018-04-16 12:05:44 +05:00
Mushtaq Ali
3db89e98ba Merge pull request #17970 from edx/mushtaq/val-version-bump 
VAL version bump
 2018-04-16 12:01:29 +05:00
Tasawer Nawaz
048329cf24 Merge pull request #17363 from edx/tasawer/learner-3962/translate-contact-us-form 
translate string on support form
 2018-04-16 11:52:14 +05:00
edX Transifex Bot
774e89ed7e Update translations 2018-04-15 17:27:41 -04:00
Mushtaq Ali
7242172e6e VAL version bump 2018-04-15 23:45:44 +05: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