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

40133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
a15d89c8bf Fix a11y issues. 
TNL-6440, TNL-6439
 2017-02-10 09:43:26 -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
Vedran Karačić
54e4bcface Merge pull request #14455 from edx/vkaracic/deactivate-jwt 
User deactivation endpoint should use JWT auth.
 2017-02-07 16:38:19 +01:00
Vedran Karacic
036e05964f User deactivation endpoint should use JWT auth. 2017-02-07 14:45:20 +00: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
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
David Ormsbee
9d1deefc91 Merge pull request #14475 from edx/ormsbee/dashboard_course_count 
New Relic metric: Enrolled courses on dashboard.
 2017-02-06 12:17:56 -05:00
David Ormsbee
da5a8b5540 New Relic metric: Enrolled courses on dashboard. 
This is so we can better map how student dashboard performance maps to
number of enrolled courses.
 2017-02-06 11:24:14 -05:00
Jillian Vogel
744fea8a21 Merge pull request #14449 from open-craft/jill/dndv2-v2.0.12 
Bump xblock-drag-and-drop-v2 to v2.0.15
 2017-02-07 01:32:47 +10:30
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
raeeschachar
8950cf6a82 Merge pull request #14453 from edx/raees/do-not-leave-the-help-window-open 
LT-53 Do not leave the help window open after verification
 2017-02-06 14:52:01 +05:00
raeeschachar
102c97752a LT-53 Do not leave the help window open after verification 2017-02-06 08:11:02 +00:00
Jillian Vogel
eb3367e684 Bumps xblock-drag-and-drop-v2 to v2.0.15 2017-02-06 08:31:17 +10:30
Renzo Lucioni
fc6d9519d2 Make service URLs optional on programs config model 
We're moving away from this config model and no longer need to specify these URLs.

ECOM-4422
 2017-02-04 23:35:06 -05:00
Brian Jacobel
aeb76a5bc7 Merge pull request #14464 from edx/bjacobel/jenkins-node-6.9.4 
Bump jenkins node version to match edx/configuration
 2017-02-03 14:27:31 -05:00
Douglas Hall
6b62b6ac58 Merge pull request #14466 from edx/douglashall/revert_wl_912 
Revert WL-912 "Added instructor info in course overview."
 2017-02-03 12:14:12 -05:00
Douglas Hall
450d35a799 Revert "Added instructor info in course overview." 
This reverts commit 180cf299a3.
 2017-02-03 11:30:17 -05:00
Calen Pennington
e71a6c24b0 Merge pull request #13899 from CredoReference/possible-to-add-multiple-tag-values 
Allow multiple values for a single tag
 2017-02-03 10:39:23 -05:00
Christina Roberts
fec2fb4e48 Merge pull request #14421 from edx/christina/wiki 
Wiki accessibility fixes.
 2017-02-03 10:34:58 -05:00
Christina Roberts
a46aec9b0e Merge pull request #14456 from edx/christina/cruft 
ALLOW_ALL_ADVANCED_COMPONENTS was deleted.
 2017-02-03 10:29:12 -05:00
Brian Jacobel
16f8f960fc Bump jenkins node vers to match edx/configuration 2017-02-03 09:52:55 -05:00
Brian Jacobel
650350436c Merge pull request #14454 from edx/bjacobel/nodeenv-1.1.1 
Upgrade nodeenv to 1.1.1
 2017-02-03 09:48:02 -05:00
cahrens
fdba584472 Removes an obsolete Django setting, ALLOW_ALL_ADVANCED_COMPONENTS. 
We moved from configuring installed components in settings.py files to using just Python entry points.
This used to be a setting which enabled all XBlocks with appropriate entry points.
It was removed from the rest of the codebase in a previous PR, and this usage was
inadvertently left behind.
 2017-02-03 09:31:01 -05:00
Dmitry Viskov
5fe79dbdb4 Allow multiple values for a single tag 2017-02-03 01:39:58 +03: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
02dd896ef6 Merge pull request #14434 from edx/ecom-6921 
ECOM-6921: Added aria-modal="true" to section tag.
 2017-02-02 15:45:34 -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
Calen Pennington
cea871ec54 Merge pull request #14336 from CredoReference/split_mongo_copy_subdag_fix_asides 
Fix asides to copy them during publish operation
 2017-02-02 14:10:17 -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
Brian Jacobel
deb69de630 Upgrade nodeenv to 1.1.1 2017-02-02 09:56:07 -05:00
Attiya Ishaque
f7aed5cb26 Merge pull request #14428 from edx/TNL-6419-change-in-code 
TNL-6419 Fix in file-checking code in Xmodule.
 2017-02-02 17:55:45 +05:00
attiyaishaque
0869df22c4 TNL-6419 Fix in file-checking code in Xmodule. 2017-02-02 17:02:59 +05:00
Marko Jevtić
43ffe63f57 Merge pull request #14429 from edx/mjevtic/WL-963 
[WL-963] Mark test as flaky
 2017-02-02 11:47:39 +01:00
Hasnain Naveed
f9365a2460 Merge pull request #14440 from edx/hasnain-naveed/instructor-info-in-courseoverview/WL-912 
WL-912 | Added instructor info in course overview model.
 2017-02-02 15:16:06 +05:00
Marko Jevtic
a83ac7d8b3 [WL-963] Mark test as flaky 2017-02-02 09:12:46 +00:00
Jillian Vogel
0e90ee5fbf Merge pull request #14015 from open-craft/haikuginger/add-swift-settings-to-cms 
Add swift settings to CMS
 2017-02-02 10:28:49 +10:30
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
94b78ecbf5 Merge pull request #14442 from edx/revert-14439-beryl/grades-mongo-query 
Revert "Fix mongo query count for Grades API"
 2017-02-01 11:12:48 -05:00