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

14385 Commits

Author SHA1 Message Date
Ned Batchelder
833f82dce9 Merge pull request #14519 from edx/nedbat/idempotent-email-uniqueness-constraint 
An idempotent migration to add an email uniqueness constraint
 2017-02-16 09:58:07 -05:00
Ahsan Ulhaq
bc418c47c5 edx.org/login?next= should not be able to point to an asset 
ECOM-6463
 2017-02-16 14:44:01 +05:00
cahrens
76ee612862 Update flaky decorators related to file upload. 
PLAT-1186
 2017-02-15 12:04:03 -05:00
Ned Batchelder
98b250b66e A new django app for unicorn migrations 2017-02-15 11:40:05 -05:00
Stu Young
1bd30cffb8 Merge pull request #14492 from edx/estute/mark-flaky-bokchoy-tests 
Estute/mark flaky bokchoy tests
 2017-02-15 09:08:27 -05:00
Ned Batchelder
04557bbff3 Make this no-op migration be a true no-op. 2017-02-15 07:16:10 -05:00
Ned Batchelder
169414b734 An idempotent migration to add an email uniqueness constraint 2017-02-15 07:16:10 -05:00
noraiz-anwar
38a6e8b0d0 Merge pull request #14494 from edx/noraiz/TNL-6470 
TNL-6470-Hide Add a post during discussion blackout period
 2017-02-15 10:24:44 +05:00
stu
cb7e260c97 fix flaky progress page and note tests 2017-02-14 21:20:28 -05:00
Jesse Shapiro
5d068cec1f Merge pull request #14496 from open-craft/haikuginger/remove-consent-from-logistration 
[ENT-173] Remove data sharing consent from logistration
 2017-02-14 11:51:53 -05:00
Ned Batchelder
1e6a74e777 No-op a migration that needs to be more clever 2017-02-14 10:01:03 -05:00
Douglas Hall
3055f9b259 Merge pull request #14339 from edx/hasnain-naveed/program-backend/WL-912 
WL-766 Program marketing page data layer
 2017-02-14 04:53:53 -05:00
noraiz-anwar
6f447d0b51 Hide Add a post during discussion blackout period 2017-02-14 11:18:12 +05:00
Hasnain
41f3bba058 Backend code for program detail page. 
This adds functions to the catalog utils which munge data
collected from the program endpoint and LMS database to construct
data structures that are ready for use by view and templates
related to the Open EdX marketing pages that live in LMS.

WL-766
 2017-02-13 20:37:56 -05:00
Douglas Hall
58f0154ee2 Add support for multi-org sites 
WL-926
 2017-02-13 19:33:47 -05:00
stu
2014f4502f mark test_content_changes_do_not_change_score_2__change_subsection_structure as flaky 2017-02-13 17:07:55 -05:00
stu
292b425cb2 mark test_navigation_buttons as flaky 2017-02-13 17:05:54 -05:00
Ayesha Baig
61f2067935 [YONK-513]: Add feature flag which allows for disabling of account creation 2017-02-13 12:28:57 +05:00
Ahsan Ulhaq
4926a6b263 Merge pull request #14481 from edx/ahsan/ECOM-7085-Create-migration-unique-email 
Added unique constraint on email
 2017-02-10 23:53:39 +05:00
Christina Roberts
62cb3ad50e Merge pull request #14486 from edx/christina/wiki-round-2 
Fix more wiki a11y issues
 2017-02-10 13:08:11 -05:00
Ahsan Ulhaq
d141eb15b1 Added unique constraint on email 
ECOM-7085
 2017-02-10 21:24:15 +05:00
cahrens
a15d89c8bf Fix a11y issues. 
TNL-6440, TNL-6439
 2017-02-10 09:43:26 -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
Jesse Shapiro
358e73c082 Remove data sharing consent from logistration 2017-02-08 13:04:54 -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
stu
3b7ab3f0e5 mark test_can_create_note_with_tags as flaky 2017-02-07 23:48:42 -05:00
stu
d9f5990489 mark test_open_note_when_accessed_from_notes_page as flaky 2017-02-07 23:44:48 -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