Commit Graph

14452 Commits

Author SHA1 Message Date
Albert (AJ) St. Aubin
22f58606af Merge pull request #14564 from edx/aj/TNL-6347_headers
Aj/tnl 6347 headers
2017-03-08 13:27:40 -05:00
Noraiz Anwar
b69b586401 Merge pull request #14601 from edx/noraiz/ECOM-6939
ECOM-6939 Fixed social auth false password-validation error
2017-03-08 22:15:46 +05:00
Albert St. Aubin
7c7c27183f changes header levels for a11y
TNL-6347
2017-03-08 11:45:45 -05:00
Albert (AJ) St. Aubin
b168b04a20 Merge pull request #14640 from edx/aj/TNL-6620_action_style
Updating the notification to remove overlap of action bar buttons
2017-03-08 10:27:27 -05:00
noraiz-anwar
1c0ccb2f61 ECOM-6939 Fixed social auth false password-validation error (adding form field) 2017-03-08 20:16:21 +05:00
alisan617
60787393ec change to comlete flex layout 2017-03-07 13:48:46 -05:00
Ahsan Ulhaq
7712bf3151 edx.org/login?next= should not be able to point to an asset
ECOM-6463
2017-03-07 22:17:50 +05:00
Attiya Ishaque
df73474c5c Merge pull request #14645 from edx/aj/discussion-fixes
Discussion Selector fixes.
2017-03-07 18:29:27 +05:00
Awais Jibran
9c0f72d516 Discussion Selector fixes. TNL-6648 2017-03-07 17:08:51 +05:00
Qubad786
f064e991bf duplicate video id in basic tab 2017-03-07 15:33:33 +05:00
Mike Dikan
06a6d8525a Removing unused fields on ProgramApiConfig model
ECOM-7196

Updating model to only include the non-deprecated fields.  This work is a follow on to ECOM-7195 and SHOULD NOT be merged until that PR is merged.
2017-03-06 16:46:04 -05:00
Albert St. Aubin
2693305354 Updating the notification to remove overlap of action bar buttons 2017-03-06 15:14:52 -05:00
M. Rehan
f90470a59e Merge pull request #14510 from edx/mrehan/mgmt-cmd-sync-mktg-urls
MA-3050 – Sync course runs from Catalog service
2017-03-06 23:21:23 +05:00
Ayub khan
b42089b0dd Revert "added log for refund cutoff date" 2017-03-06 20:50:05 +05:00
Qubad786
7c1f6ff2c0 Mgmt. Command to Sync Marketing Urls from Catalog service
Introduces a mgmt. command that retrieves course runs from catalog service in order to update marketing urls for the courses found in course metadata cache (i.e. CourseOverview). This also provides an updated utility to retrieve course sharing url.
2017-03-06 20:12:31 +05:00
Awais Jibran
2881bac3bc Merge pull request #14623 from edx/aj/fix-edit-discussions
Fix discussion Edit post.
2017-03-03 18:29:51 +05:00
mikedikan
dca22ff229 Merge pull request #14613 from edx/mdikan/remove-deprecated-references-to-apiconfig
Remove deprecated references to ProgramsApiConfig model
2017-03-03 07:42:21 -05:00
Awais Jibran
0f1ec82e0a Fix discussion Edit post.
TNL-6631
2017-03-03 15:29:13 +05:00
Asad Azam
3102b2dd80 added log for refund cutoff date 2017-03-03 15:05:51 +05:00
Ahsan Ulhaq
2d1bb9bf7f Hidden html sontent on the dashboard are rendered
ECOM-6977
2017-03-03 13:17:31 +05:00
Mike Dikan
ca64946b99 Remove deprecated references to ProgramsApiConfig model
ECOM-7195

The (now deprecated) programs service had several fields to set up configuration of the API.  We are removing the property/field references in codeas the first part of deprecating the model fields.  Also being removed are the model properties.
2017-03-02 18:07:23 -05:00
Uzair Rasheed
ed658ff868 Merge pull request #14508 from edx/uzairr/ECOM-6757
Send activation email to un-activated user
2017-03-02 19:05:59 +05:00
uzairr
07ddf9b452 Send activation email to un-activated user 2017-03-02 10:04:09 +00:00
Hasnain Naveed
92348a2447 Merge pull request #14596 from edx/hasnain-naveed/WL-989
Management command for back-populating the 'created_on_site' in UserA…
2017-03-02 12:36:38 +05:00
Hasnain
7764b0128f Management command for back-populating the 'created_on_site' in UserAttribute model. 2017-03-01 18:09:49 +05:00
Andy Armstrong
f6876ce199 Merge pull request #13937 from edx/andya/use-ui-blocks
[WIP] Use web fragments for discussion and static tabs
2017-03-01 00:36:48 -05:00
Nimisha Asthagiri
77a29242e3 Merge pull request #14571 from edx/beryl/cbs_models
Storage-backed versioned Block Structures: Models
2017-02-28 23:50:21 -05:00
Andy Armstrong
248558f1d4 Render Discussion tab using web fragments 2017-02-28 23:39:39 -05:00
Jesse Shapiro
ff581d003f Remove unnecessary pipeline element; use new name for existing element 2017-02-28 09:54:57 -05:00
Ben Patterson
819706a1c5 Remove flaky decorator. Feel optimistic. 2017-02-27 14:21:46 -05:00
Ben Patterson
a745b2d401 Temp commit to ensure flakiness is corrected. 2017-02-27 12:12:47 -05:00
Ben Patterson
4c527c370f Fix flakiness on test (it wasn't waiting for jquery to be loaded) 2017-02-27 12:11:58 -05:00
Nimisha Asthagiri
6f9b810f9a Storage-backed versioned Block Structures: Configuration 2017-02-27 00:39:22 -05:00
cahrens
8fedc08c2a Support web fragments for tabs. 2017-02-24 17:55:32 -05:00
Brandon DeRosier
36b0068bd1 Merge pull request #14542 from open-craft/bdero/ent-162
ENT-162 Create an EnterpriseCourseEnrollment during the enrollment flow
2017-02-24 16:24:19 -05:00
alisan617
c51c103880 Merge pull request #14576 from edx/alisan/discussion-topic-TNL-6205
Discussion topic area section after Add Post
2017-02-24 15:58:43 -05:00
alisan617
4197ebf7f4 check if general topic exists 2017-02-24 15:04:25 -05:00
David Ormsbee
47e606b3ca Find the courses a user has certs for up front.
Before this commit, we had to do a separate query for every course a
user was enrolled in when determining whether a course was refundable
(if you have a certificate, it isn't). Now the student dashboard will
make a one-time query to grab all of a user's cert-issued courses. This
is indexed, so it should be much faster than grabbing each one
separately.
2017-02-23 22:24:00 -05:00
Brandon DeRosier
cb85ef1f5b ENT-162 Create an enterprise enrollment during the enrollment flow 2017-02-23 19:15:20 -05:00
Clinton Blackburn
9d9cf1a84b Added support for JWT authentication to the Enrollment API
ECOM-7099
2017-02-23 18:20:36 -05:00
David Ormsbee
8423ecb1c8 Student Dashboard CourseOverviews with one query.
Pre-load the course overviews attached to CourseEnrollments on the
Student Dashboard, if possible. This will only grab the CourseOverviews
that already exist, and will not generate new ones. Any missing
CourseOverviews fall back to the lazily-created one-at-a-time behavior
they've always had. That's mostly because I wanted to optimize for the
common case in the least invasive way possible, and I don't want to get
caught up in locking issues.
2017-02-23 15:50:44 -05:00
David Ormsbee
527774ef1a Merge pull request #14545 from edx/ormsbee/enrollment_select_related_user
Select related users when returning enrollments.
2017-02-23 11:53:38 -05:00
David Ormsbee
2051c90924 Test Speedup: Isolate Modulestore Signals
There are a number of Django Signals that are on the modulestore's
SignalHandler class, such as SignalHandler.course_published. These
signals can trigger very expensive processes to occur, such as course
overview or block structures generation. Most of the time, the test
author doesn't care about these side-effects.

This commit does a few things:

* Converts the signals on SignalHandler to be instances of a new
  SwitchedSignal class, that allows signal sending to be disabled.

* Creates a SignalIsolationMixin helper similar in spirit to the
  CacheIsolationMixin, and adds it to the ModuleStoreIsolationMixin
  (and thus to ModuleStoreTestCase and SharedModuleStoreTestCase).

* Converts our various tests to use this new mechanism. In some cases,
  this means adjusting query counts downwards because they no longer
  have to account for publishing listener actions.

Modulestore generated signals are now muted by default during test runs.
Calls to send() them will result in no-ops. You can choose to enable
specific signals for a given subclass of ModuleStoreTestCase or
SharedModuleStoreTestCase by specifying an ENABLED_SIGNALS class
attribute, like the following example:

    from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase

    class MyPublishTestCase(ModuleStoreTestCase):
        ENABLED_SIGNALS = ['course_published', 'pre_publish']

You should take great care when disabling signals outside of a
ModuleStoreTestCase or SharedModuleStoreTestCase, since they can leak
out into other tests. Be sure to always clean up, and never disable
signals outside of testing. Because signals are essentially process
globals, it can have a lot of unpleasant side-effects if we start
mucking around with them during live requests.

Overall, this change has cut the total test execution time for
edx-platform by a bit over a third, though we still spend a lot in
pre-test setup during our test builds.

[PERF-413]
2017-02-23 10:31:16 -05:00
Ned Batchelder
3cfec2807a Merge pull request #14566 from edx/nedbat/prevent-openblas-threads
Prevent OpenBLAS from spawning worker threads. TNL-6456
2017-02-23 09:53:02 -05:00
Adam
59963802fb Merge pull request #14569 from edx/aj/fix-discussion-follow-post
Fix posts are not automatically followed
2017-02-23 09:25:29 -05:00
Stu Young
786444958f Merge pull request #14548 from edx/mzfr/fix-webOb-tnl6553
Adding text param to webob response for 1.7.1.
2017-02-23 08:54:12 -05:00
Awais Jibran
091fd73415 posts are not automatically followed. TNL-6582 2017-02-23 17:38:15 +05:00
raeeschachar
61a12b4b0d Merge pull request #14558 from edx/raees/LT54-page-object-to-platform_part1
Moving upgraded e2e page objects to platform
2017-02-23 16:52:57 +05:00
raeeschachar
ea3797c365 Moving upgraded e2e page objects to platform 2017-02-23 10:58:28 +00:00
Matt Drayer
685524bb70 Merge pull request #14541 from edx/mattdrayer/direct-idp-login
ENT-228: Allow tpa_hint to match hidden providers
2017-02-22 17:10:54 -05:00