Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,983 Commits 1 Branch 0 Tags
55bfb74c6d5ab9e435764fb718f210bbb1e64d82
Commit Graph

13274 Commits

Author SHA1 Message Date
Adam
55bfb74c6d Merge pull request #12481 from edx/fix-memory-leak 
clear request cache after celery task finishes (TNL-2705)
 2016-05-18 14:31:22 -04:00
cahrens
fd1d72cc8d Wait for seek to complete before pressing play. 
TNL-4540
 2016-05-18 13:13:20 -04:00
Adam Palay
04dd61bead remove logging 2016-05-18 12:56:35 -04:00
Christina Roberts
16e9f9c6c7 Merge pull request #12500 from edx/christina/tnl-1619 
Can no longer play outside of the start/end time for the clip.
 2016-05-18 11:55:23 -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
Syed Hasan raza
3e747c379f Merge pull request #12443 from edx/shr/log/PLAT-1023-PLAT-1031-Detail-Logging 
Detail Logging xmodule exceptions
 2016-05-18 13:59:54 +05:00
Alison Hodges
214091d33b Merge pull request #12467 from edx/ahodges/xrefs 
Updates and corrects href links to readthedocs
 2016-05-17 17:35:41 -04:00
clrux
f0b33e33ff Merge pull request #12244 from edx/clrux/ac-399 
AC-399 adding alt for circuit schematic controls
 2016-05-17 17:11:38 -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
Alison Hodges
95894da528 Updates and corrects href links to readthedocs 2016-05-17 15:01:00 -04:00
cahrens
9d28237326 Can no longer play outside of the start/end time for the clip. 
This functionality was removed in PR 7111, but not all impacted
tests were deleted.
 2016-05-17 14:45:24 -04:00
Diana Huang
d38b43cce3 Set self.browser consistently in page objects. 2016-05-17 11:08:22 -04:00
Syed Hassan Raza
ba280e2cf9 Detail Logging xmodule exceptions 2016-05-17 17:31:59 +05: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
Matt Drayer
238ae554cb Merge pull request #12456 from edx/mattdrayer/add-bulk-sku-default-none 
mattdrayer/add-bulk-sku-default-none: Fix MySQL insert error
 2016-05-13 07:47:25 -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
Renzo Lucioni
a3e1854bf1 Fix a11y tests 2016-05-12 16:40:22 -04:00
AlasdairSwan
bc5daffc96 ECOM-4215 adding setup for new program details page 2016-05-12 16:39:23 -04:00
Robert Raposa
2089728703 Safe template marathon work 2016-05-12 14:23:35 -04:00
Ben Patterson
c788a1bed3 Merge pull request #12431 from edx/benp/flaky-tnl-4561 
Flag test as flaky.
 2016-05-11 14:04:17 -04:00
Ben Patterson
e3469160c4 Flag test as flaky. 2016-05-11 13:01:38 -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
Brian Jacobel
e8d2a626d4 Merge pull request #12417 from edx/bjacobel/fix-release-2016-05-10-merge-conflicts-with-master 
Fix release 2016 05 10 merge conflicts with master
 2016-05-10 13:03:19 -04:00
Brian Jacobel
d88aad7d79 Merge branch 'release' into bjacobel/fix-release-2016-05-10-merge-conflicts-with-master 2016-05-10 12:15:42 -04:00
AlasdairSwan
9becd565b3 If not certificates remove the container element from the DOM 2016-05-10 11:42:29 -04:00
Chris Rodriguez
e5a8c2220f Updating icons to work in high contrast mode 2016-05-10 08:33:03 -04:00
Chris Rodriguez
82cd5a7283 AC-399 making buttons with title and sr text 2016-05-10 08:33:03 -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
Christina Roberts
e953044786 Merge pull request #12388 from edx/christina/course-search-cohort-test 
Fix flaky cohort tests
 2016-05-09 15:51:31 -04:00
Ben Patterson
c00355ae51 Fix linting issue. 2016-05-09 13:26:34 -04:00
Adam Palay
bfb319db9a add discussion_id to course structure dump command (AN-6696) 
add test case for discussion_id already set in XML
 2016-05-09 11:24:37 -04:00
cahrens
7ff3c4b3fb Verify New Cohort form is rendered. 
TNL-2257
 2016-05-09 11:21:06 -04:00
wajeeha-khalid
05b2e65e0f MA-2247 return student view data for discussion module 2016-05-09 17:37:31 +05:00
Calen Pennington
ccaafce05b Merge pull request #12205 from cpennington/disable-caching-in-tests 
Disable caching in LMS tests
 2016-05-06 15:22:48 -04:00
Alison Hodges
a422ad60f7 corrects guide name in template 2016-05-06 14:48:59 -04:00
Alison Hodges
289a4a2abe Merge pull request #12382 from edx/ahodges/DOC-2866 
Updates link to learner info in Numerical Input template
 2016-05-06 14:46:22 -04:00
Ben Patterson
162135736c Merge pull request #12361 from edx/benp/skip-extra-flaky-tests-fedx-88 
Skip tests that are too flaky to be reliable. FEDX-88.
 2016-05-06 12:16:41 -04:00
Ben Patterson
72af8afd67 Skip tests that are too flaky to be reliable. FEDX-88. 2016-05-06 11:27:33 -04:00
Diana Huang
07573c5141 Replace old conditional lettuce test with bok choy version. 2016-05-06 09:38:36 -04:00
Alison Hodges
afc5686391 Updates link to learner info in Numerical Input template 2016-05-05 22:29:57 -04:00
Usman Khalid
a2dadeaaf3 Added some documentation to Karma configuration files. 2016-05-05 22:42:04 +05:00
Usman Khalid
667a9b9ae6 Moved common files into karma.common.conf.js. 2016-05-05 22:42:04 +05:00
Usman Khalid
39f32f9869 Simplified normalizePathsForCoverage. 2016-05-05 22:42:03 +05:00