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

14360 Commits

Author SHA1 Message Date
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
muzaffaryousaf
d73d2f5889 Increase the yttimeout to un-skip the video tests. 2017-02-08 20:30:54 +05:00
Troy Sankey
6ed8dcda2c Merge pull request #14479 from edx/pwnage101/update-custom-metrics-docstrings 
improve docstrings for newrelic_custom_metrics middleware
 2017-02-07 11:24:08 -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
Troy Sankey
cb122fc027 improve docstrings for newrelic_custom_metrics middleware 
Additional comments in this commit clarifies an additional use-case for
the newrelic_custom_metrics.accumulate function: reporting a metric
without accumulation.  Also:

* Fixes docstring style to use the "google" style.
* Adds link to custom metrics table in the wiki in an attempt to help
  keep the tables in sync with the code.
* Inserts a TODO.
* other typos.
 2017-02-06 17:17:51 -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
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
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
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
alisan617
68a29ad09b change loading animation to FA user role style change 2017-02-02 15:51:18 -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
attiyaishaque
0869df22c4 TNL-6419 Fix in file-checking code in Xmodule. 2017-02-02 17:02:59 +05:00
Marko Jevtic
a83ac7d8b3 [WL-963] Mark test as flaky 2017-02-02 09:12:46 +00: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
Dmitry Viskov
5d887adc09 Fix asides to copy them during publish operation (bug in modulestore/split_mongo/split.py:SplitMongoModuleStore._copy_subdag method) 2017-02-01 18:36:27 +03:00
Florian Haas
85a8e22117 v2 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 v2 (Pattern Library)
Sass.
 2017-02-01 11:52:33 +01: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
cahrens
0f3eb6e94c Fix safe template warning. 2017-01-31 13:43:36 -05:00
Christina Roberts
feb1c82d4d Merge pull request #14415 from edx/christina/tnl-6357 
Show checkmarks when "Show Answer" is clicked.
 2017-01-31 10:57:18 -05:00
cahrens
55712d1148 Show checkmarks when "Show Answer" is clicked. 
TNL-6357
 2017-01-31 09:55:08 -05:00
Vedran Karacic
7fe8e47554 [SOL-2133] Add user deactivation endpoint. 2017-01-31 11:34:26 +00:00
Saleem Latif
ab88da952b Update settings for edx-enterprise (v0.19.1) configurations. 2017-01-31 14:19:51 +05:00
Renzo Lucioni
1e929897f0 Merge pull request #14411 from edx/renzo/86-program-editor 
Remove the program admin tool from Studio
 2017-01-28 00:51:38 -05:00
Renzo Lucioni
31f5c8ddcb Remove the program admin tool from Studio 
All programs are now managed using the Django admin on the catalog service. This is the first in a series of commits removing use of the old programs service from edx-platform.

ECOM-4422
 2017-01-27 19:33:06 -05:00
Brian Jacobel
c407127db9 Use a capital letter where 'Required' is a separate sentence 2017-01-27 12:23:52 -05:00
Brian Jacobel
c67b8aa0bb Visually indicate fields in new post form are required 2017-01-26 15:48:35 -05:00
Ned Batchelder
8d791b5823 Use latest pyparsing 2.0.x to avoid setuptools entanglement 
With 2.0.1, and setuptools 34.0.2, errors happen like:

File "/edx/app/edxapp/venvs/edxapp-sandbox/local/lib/python2.7/site-packages/packaging/requirements.py", line 59, in <module>
    MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
TypeError: __call__() takes exactly 2 arguments (1 given)

(cherry picked from commit 73519b3547359a0b791e39d4665f51ac66449a17)
 2017-01-25 15:10:02 -05:00
asadiqbal
8f5ba0115c WL-606 2017-01-25 15:05:57 +05:00
John Eskew
ab190a8507 Merge pull request #14284 from open-craft/haikuginger/filter-by-block-name 
Restrict block ID comparison slightly to avoid false positives
 2017-01-24 19:32:14 -05:00
noraiz-anwar
44efc5aaf0 Merge pull request #14365 from edx/na/TNL-6333 
TNL-6333 Log play_video event after seek_video event
 2017-01-24 20:26:19 +05:00
Renzo Lucioni
4c9066cf4e Use switch to pull programs from the catalog for the student dashboard 
ECOM-4422
 2017-01-23 15:57:59 -05:00
noraiz-anwar
4679766655 Emit play_video event after seek_video event 2017-01-23 17:36:43 +05:00
alisan617
bcaeaffa7b Merge pull request #14338 from edx/alisan/inline-discussion-sort-TNL-6117 
Inline discussion sorting TNL-6117
 2017-01-20 10:48:35 -05:00
alisan617
f12dfae2d1 inline discussion component filtering and sorting 
TNL-6117
 2017-01-20 09:52:44 -05:00
Eric Fischer
f84f3c09d3 Merge pull request #14343 from edx/efischer/hide_after_end 
Revert "Merge pull request #14324 from edx/efischer/revertins"
 2017-01-18 13:51:04 -05:00
Jeff LaJoie
43c5cb2af8 Merge pull request #14307 from edx/jlajoie/TNL-5619 
Fixes submit button enablement on save/reset
 2017-01-18 11:40:28 -05:00
Eric Fischer
507e621ccc Revert "Merge pull request #14324 from edx/efischer/revertins" 
This reverts commit c7d2d601b8, reversing
changes made to fb2173f43e.
 2017-01-18 10:56:13 -05:00