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

15662 Commits

Author SHA1 Message Date
sanfordstudent
fd7de0cab5 Merge pull request #14477 from edx/sstudent/TNL-6349 
only show nav utils if populated
 2017-02-10 09:09:12 -05:00
Albert (AJ) St. Aubin
c1e2d39b38 Merge pull request #14444 from edx/aj/TNL-6381_upsell_msg 
Aj/tnl 6381 upsell msg
 2017-02-10 07:25:23 -05:00
Albert St. Aubin
97d7633774 Added upgrade upsell to course info banner and url parameter 
TNL-6381
 2017-02-09 20:21:39 -05:00
Jesse Shapiro
424b4356a5 Merge pull request #14400 from open-craft/haikuginger/enterprise-course-consent 
[ENT-101] Add course-specific data sharing consent hooks for Enterprise app
 2017-02-09 18:37:55 -05:00
Renzo Lucioni
dda0e03f65 Merge pull request #14488 from edx/renzo/finish-catalog-transition 
Finish transition to catalog for program data
 2017-02-09 16:10:44 -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
9a573de533 Add consent check to course access prerequisites; add utility functions to provide interface to course-specific consent in Enterprise app 2017-02-09 13:49:57 -05:00
Muzaffar yousaf
ff66781a7e Merge pull request #14316 from edx/mzfr/video-bokchoy 
un-skip video tests.
 2017-02-09 15:46:04 +05:00
alisan617
85ff8a62a2 Merge pull request #14476 from edx/alisan/post-add-response-focus-TNL-6170 
Discussion thread bring focus to response list after submitting a response or comment
 2017-02-08 14:06:32 -05:00
alisan617
813e86041c Bring focus to response list after submitting a response or comment 2017-02-08 13:02:04 -05:00
Nimisha Asthagiri
31ec562168 Merge pull request #14490 from edx/beryl/request-cache-feature-flag 
request-cache grades feature flag to avoid 400+ memcached hits
 2017-02-08 11:41:55 -05:00
Nimisha Asthagiri
2026a518d5 Merge pull request #14489 from edx/beryl/new-relic 
Add new relic parameters to grades task
 2017-02-08 11:41:30 -05:00
muzaffaryousaf
d73d2f5889 Increase the yttimeout to un-skip the video tests. 2017-02-08 20:30:54 +05:00
Nimisha Asthagiri
f2abce53cb request-cache grades feature flag to avoid 400+ memcached hits 2017-02-08 10:01:52 -05:00
sanfordstudent
37c266f08f Merge pull request #14423 from edx/sstudent/TNL-6219 
add course and user id to library content assigned
 2017-02-08 09:47:59 -05:00
Qubad786
7d320f7ef8 remove unnecessary bookmark screen readers 2017-02-08 12:45:04 +05:00
Nimisha Asthagiri
697b3d7d98 Add new relic parameters to grades task 2017-02-07 19:29:17 -05:00
Sanford Student
1a5e15fd5c add course and user id to library content assigned 2017-02-07 13:52:15 -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
Douglas Hall
f7d5e7e1db Merge pull request #14472 from edx/douglashall/WL-931 
WL-931 Allow for customization of course email template at the organization level
 2017-02-06 15:09:58 -05:00
Sanford Student
85f6401458 only show nav utils if populated 2017-02-06 14:36:10 -05:00
Douglas Hall
06fa13f4df Allow for customization of course email template at the organization level 2017-02-06 14:23:58 -05:00
alisan617
029060f797 Merge pull request #14467 from edx/alisan/discussion-new-post-form-TNL-6366 
Reveal radio buttons in discussion post form post type options
 2017-02-06 13:17:23 -05:00
alisan617
ef48141780 change post type options to radio buttons actually just reveal them 2017-02-06 12:37:38 -05:00
sanfordstudent
70496204f8 Merge pull request #14445 from edx/sstudent/TNL-6348 
switch aria role of left nav from group to region
 2017-02-06 09:19:24 -05:00
Christina Roberts
fec2fb4e48 Merge pull request #14421 from edx/christina/wiki 
Wiki accessibility fixes.
 2017-02-03 10:34:58 -05:00
alisan617
fb66d29813 Merge pull request #14448 from edx/alisan/discussion-luv-TNL-6173-6176 
Discussion loading indicator and user role style change, show hide button focus, and copy change to discussion filter
 2017-02-02 17:15:42 -05:00
cahrens
95672ec264 Accessibility fixes and tests. 
TNL-6369, TNL-6368
 2017-02-02 16:44:00 -05:00
Ned Batchelder
a9031061ad Merge pull request #14461 from edx/ned/update-translations 
Update translations (autogenerated message)
 2017-02-02 16:03:07 -05:00
alisan617
68a29ad09b change loading animation to FA user role style change 2017-02-02 15:51:18 -05:00
Dave Chamberlain
fe2e25df65 ECOM-6921: Added aria-modal="true" to Support Modal 
Changed the section to a div, and converted the aria-label
    to a labelledby attr instead (no sense in generating the string
    mulitiple times).
 2017-02-02 15:43:26 -05:00
Ned Batchelder
c2573ab5d6 Update translations (autogenerated message) 2017-02-02 14:53:47 -05:00
Nimisha Asthagiri
9436edf856 Merge pull request #14446 from edx/beryl/grades-mongo-query 
Fix mongo query count for Grades API
 2017-02-02 11:13:06 -05:00
Nimisha Asthagiri
7cc08399c6 Fix mongo query count for Grades API 2017-02-01 17:58:36 -05:00
Jesse Shapiro
9d5db5ae24 Adds OpenStack settings to CMS environment 
and a comment and explaining why we import aws.* in the openstack settings.
 2017-02-02 09:27:22 +10:30
Nimisha Asthagiri
1912176c5a Merge pull request #14438 from edx/beryl/cohort_integrity_error 
Fix cohort IntegrityErrors
 2017-02-01 15:35:21 -05:00
Andy Armstrong
1c6cfb0b04 Merge pull request #14441 from fghaas/color-default 
FEDX-300 Set !default on Sass colors
 2017-02-01 15:03:17 -05:00
Sanford Student
d9a96b03b9 switch aria role of left nav from group to region 2017-02-01 14:55:46 -05:00
Jesse Zoldak
d1012a771d Merge pull request #14425 from edx/revert-14200-jmbowman/async_course_import 
Revert "PLAT-1104 Import courses asynchronously"
 2017-02-01 11:32:39 -05:00
Jesse Zoldak
b0647e7d83 Revert "Fix mongo query count for Grades API" 2017-02-01 11:09:43 -05:00
Nimisha Asthagiri
0f89af8af1 Merge pull request #14439 from edx/beryl/grades-mongo-query 
Fix mongo query count for Grades API
 2017-02-01 10:27:43 -05:00
Brian Jacobel
e8a60f7da8 Merge pull request #14437 from edx/bjacobel/wmd-disabled-undo-redo 
Add aria-disabled to WMD undo/redo buttons
 2017-02-01 10:11:00 -05:00
Nimisha Asthagiri
704a16ad3f Fix mongo query count for Grades API 2017-02-01 09:32:27 -05:00
Florian Haas
b7f996afcb v1 Sass (LMS): remove duplicate color definition 
The double definition of $blue-d1, $blue-d2, and $blue-d4 is
superfluous, so remove the second instance of each.
 2017-02-01 11:52:33 +01:00
Florian Haas
688c3f395d v1 Sass (LMS): set !default on all colors 
Colors should be overridable.
See https://openedx.atlassian.net/browse/PLAT-1181

This sets all color variables to !default for v1 (pre-Pattern Library)
Sass.
 2017-02-01 11:52:28 +01:00
Clinton Blackburn
7c39978b06 Automated refund approval process 
Refunds are now processed automatically. If the automated processing fails, the system falls back to the previous behavior of notifying the Support Team. Additionally, these calls are all made by the service user rather than the learner.

ECOM-6541
 2017-02-01 01:51:21 -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
Nimisha Asthagiri
95b4cbbcf8 Fix cohort Integrity Errors 
TNL-5725
 2017-01-31 22:56:56 -05:00
Brian Jacobel
ecc9afa19c Add aria-disabled to WMD undo/redo buttons 2017-01-31 17:11:28 -05:00