Commit Graph

5589 Commits

Author SHA1 Message Date
Asad Iqbal
18cddf6e1e Merge pull request #12488 from edx/asadiqbal08/WL-477
Got two thumbs up, so merging. 
WL-477 Route direct references to email address configurations through theming.helpers
2016-05-23 17:56:28 +05:00
asadiqbal
1c19ebb443 WL-477 2016-05-23 13:24:05 +05:00
Calen Pennington
2aa9967189 Merge pull request #12386 from cpennington/cale/concurrent-unit-tests
[EV-12] Run LMS unit tests concurrently on jenkins
2016-05-19 14:25:24 -04:00
Calen Pennington
e731a118a6 Make external_auth.test_openid_provider tests run independently 2016-05-18 14:10:28 -04:00
Adam Palay
a7d638de9e clear request cache after celery task finishes (TNL-2705)
set max_num_courses_in_cache on modulestore
2016-05-18 10:43:54 -04:00
Clinton Blackburn
c67ef7a8fa Merge pull request #12457 from edx/clintonb/user-update
User administration updates
2016-05-17 16:35:09 -04:00
Peter Fogg
d5cae7b58a Merge pull request #12450 from edx/peter-fogg/referral-tracking
Add referral tracking for new registrations.
2016-05-16 12:08:56 -04:00
Peter Fogg
0e66baf41f Add referral tracking for new registrations.
ECOM-4325
2016-05-16 11:17:23 -04:00
Eric Fischer
0cf3e39c31 Replace bulk email settings with admin config models
Moves ENABLE_INSTRUCTOR_EMAIL and REQUIRE_COURSE_EMAIL_AUTH from settings files
to admin-accessible configuration models. This allows for the bulk email settings
to be modified without a new AMI deploy. See TNL-4504.

Also updates tests:
    -python tests mock out the new configurations in place of the old settings
    -lettuce test has been moved to bokchoy
        (note that there was some loss of coverage here - the lettuce tests had
        been doing some voodoo to allow for cross-process inspection of emails
        messages being "sent" by the server, from the client! In discussion with
        testeng, this seems outside the realm of a visual acceptance test. So,
        the bokchoy test simply confirm the successful queueing of the message,
        and leaves the validation of sending messages to the relevant unit tests.)
    -bok choy fixture has been added, to replace the settings in acceptance.py
    -lettuce and bok choy databases have been updated to reflect the backend changes

The new default is to have bulk_email disabled, we'll need to call this out in the
next OpenEdx release to ensure administrators enable this feature if needed.
2016-05-16 11:09:39 -04:00
Peter Fogg
89838d40ed Merge pull request #12373 from edx/peter-fogg/password-change-session-invalidation
Expire sessions after a password change.
2016-05-16 09:17:45 -04:00
Robert Raposa
1720645302 Merge pull request #12180 from edx/robrap/safe-template-marathon
TNL-4290: Safe template marathon work
2016-05-13 09:42:46 -04:00
Clinton Blackburn
ebf32dc208 Moved manage_user and manage_group from edx-management-commands
We need to create a user profile in order for users to be usable. This, coupled with the fact, that edx-platform is the owner of auth information, means these commands belong here.

ECOM-4310
2016-05-13 09:16:04 -04:00
Clinton Blackburn
b6b5fdc28e Updated UserAdmin
The profile now appears inline for the user model.

ECOM-4310
2016-05-13 01:39:49 -04:00
Matt Drayer
e65dcc37a7 mattdrayer/add-bulk-sku-default-none: Fix MySQL insert error 2016-05-12 23:20:20 -04:00
Peter Fogg
524e229245 Expire sessions after a password change.
This is slightly more complicated than it should be since we're using
custom authentication middleware (i.e., not Django's standard
middleware class). We have to check that the session auth hash we have
stored is equal to the request's session auth hash (since the stored
hash is a function of the password). Normally this gets handled in
`django.contrib.auth.get_user`, but due to our caching we don't go
through that function, even in the cache miss case.

ECOM-4288
2016-05-12 16:44:56 -04:00
Robert Raposa
2089728703 Safe template marathon work 2016-05-12 14:23:35 -04:00
Matt Drayer
a9b7e4c63d mattdrayer/course-mode-bulk-sku: Add new CourseMode field
* mattdrayer: Add bulk checkout link to course views
* asadiqbal08: MAYN-225 replace the "Verify Now" button by the "Go to Dashboard" button in case of themed sites.
* mattdrayer: Add bulk_sku check in courseware.views
2016-05-11 10:57:24 -04:00
attiyaishaque
dbad1881d2 Screenreader added to the button "Upgrade to Verified" and "View Xseries Details" in LMS Dashboard. 2016-05-10 12:42:12 +05:00
Calen Pennington
853bfe7a36 Add a TestCase mixin for enabling caches in tests
By default, disable all caching in tests, to preserve test independence.
In order to enable caching, inherit from CacheSetupMixin, and specify
which cache configuration is needed.

[EV-32]
2016-05-04 14:51:30 -04:00
Calen Pennington
18e1610043 Remove the create_user argument to setUp.
Instead, use a class attribute to define test behavior. This allows for
easier addition of new mixins over time.
2016-05-04 11:35:55 -04:00
Calen Pennington
39ff841d1f Don't pass arguments to setUp (for UrlResetMixin)
The TestCase API doesn't accept arguments, so passing arguments for some
TestCase subclasses makes adding new inheritance/mixins tricky. Instead,
prefer configuration via class attributes for TestCases.
2016-05-04 11:34:51 -04:00
Toby Lawrence
00cbc291e6 Merge pull request #12283 from edx/PERF-317
Add NewRelic instrumentation to contentserver.
2016-05-04 09:57:35 -04:00
Nimisha Asthagiri
c6954902e3 Create courseware/views folder 2016-05-03 09:02:45 -04:00
Nimisha Asthagiri
2f581448da Refactor Courseware Index
MA-2189
2016-05-03 09:02:44 -04:00
Toby Lawrence
bfefde09b6 [PERF-274] [PERF-317] Add NewRelic instrumentation to contentserver.
This includes the course key/path for a given contentserver request,
 whether or not the asset is locked, cacheable, has been modified, etc.

This should give us some better insight as to what sort of requests
 are coming into the contentserver to figure out whether or use of
 a CDN in front of these assets is as efficient as effective as it
 could be.
2016-05-02 11:28:44 -04:00
Ayub khan
d45c4d8caf Revert "Implement 'from_string_or_404' in utils" 2016-05-02 14:23:39 +05:00
Ehtesham Kafeel
8cf89d3a8e Merge pull request #12289 from edx/mzfr/backbone-cleanup
Replace backbone-min.js to backbone.js
2016-04-29 16:53:02 +05:00
Ben Patterson
b9558a90f1 Create a 3rd explicit shard for unit tests.
More accurately, this creates a 4th shard because the
last shard is always the default.
2016-04-28 10:09:32 -04:00
Ayub khan
986209669d Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404" 2016-04-28 15:50:17 +05:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
John Eskew
0899871958 Merge pull request #11042 from edx/jeskew/xml_removal
Remove XML modulestore code from most tests.
2016-04-27 11:20:02 -04:00
Renzo Lucioni
63b65ab035 Merge pull request #12231 from edx/renzo/program-progress
Measuring program progress
2016-04-27 09:24:09 -04:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm.
TNL-4335
2016-04-27 12:48:45 +05:00
Renzo Lucioni
5da6a598dd Measuring program progress
Introduces a utility class for gauging a user's progress towards program completion. Progress data is passed to the ProgramListFactory. ECOM-3200.
2016-04-26 13:36:58 -04:00
Chris Rodriguez
5137b9f8b6 Adding legacy event_type for language menu events 2016-04-25 08:58:43 -04:00
J. Clifford Dyer
001874c42e Update seq_* to edx.ui.lms.sequence.* format
seq_next, seq_prev, and seq_goto events are all renamed, and maintain
legacy compatibility.

This PR also introduces new EventTransformer framework to shim events
based on name prefix.

MA-2221
2016-04-22 13:38:41 -04:00
Christine Lytwynec
66e2d06235 Merge pull request #12060 from edx/clytwynec/ac-367
Clytwynec/ac 367
2016-04-22 09:49:26 -04:00
Christine Lytwynec
6e93cee2da add --skip-fetch flag, update start_urls, update auto_auth to include redirect_to param 2016-04-21 14:21:16 -04:00
John Eskew
84da6e4c1f Address DaveO's comments. 2016-04-21 11:56:23 -04:00
Adam Palay
9a4f80e5c0 update query for whitelisted users who haven't yet had certs run for them
remove CertificateStatuses.regenerating
2016-04-20 09:01:49 -04:00
Ayub khan
0becea942f Merge pull request #12144 from Ayub-Khan/SUST-35-course_key_from_string_or_404
SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404
2016-04-19 18:44:13 +05:00
tasawernawaz
b4e1e97185 ECOM-3201
Updated dashboard UI for empty list of courses and programs
2016-04-18 08:48:21 +00:00
Ayub-khan
e687f1e754 -Adressed all comments 2016-04-18 11:57:31 +05:00
Adam
98b8b68d40 Revert "Updated dashboard UI for empty list of courses and programs" (#12166) 2016-04-15 12:46:21 -04:00
Ayub-khan
ef70d017c8 -fixed failing tests
-Adressed all comments
2016-04-15 15:40:21 +05:00
tasawernawaz
00d2d6d20d Merge pull request #12153 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs-updated
Updated dashboard UI for empty list of courses and programs
2016-04-15 13:08:24 +05:00
tasawernawaz
ba6ba40e2e ECOM-3201
Updated dashboard UI for empty list of courses and programs
2016-04-15 06:50:03 +00:00
Renzo Lucioni
5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master
Manually merge release into master
2016-04-15 00:47:54 -04:00
Andy Armstrong
60fab86f01 Reconcile double reverts
Resolves conflicts between reverts of pattern library test pages and multi-site comprehensive theming, and the re-introduction of pattern library test pages. Fixes a pipeline rendering test which relied on other tests updating assets. The test now ensures that static assets are available before running.
2016-04-14 23:28:55 -04:00
Simon Chen
582debcd58 Merge pull request #12135 from edx/schen/ECOM-3195
ECOM-3195 Edit the navigation header on dashboard to expose program listing page
2016-04-14 15:51:19 -04:00