Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,076 Commits 1 Branch 0 Tags
8a9df36809aa487e362bb4fd5d7b462bdf92ccdf
Commit Graph

13301 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
Gabe Mulley
1ee87c887a Merge pull request #12212 from CredoReference/assigned-tags-included-in-the-emitted-event 
Connected aside information is included in the emitted event (on check)
 2016-05-20 09:41:10 -04:00
Chris Rodriguez
2a1d4d5401 Updating video player controls with better accessibility 2016-05-20 08:14:32 -04:00
Chris Rodriguez
721fffc9c4 AC-407 adding lable to video progress 2016-05-20 07:43:04 -04:00
Chris Rodriguez
bf9380523f AC-406 adding label to volume slider 2016-05-20 07:43:04 -04:00
clrux
74abec3f1c Merge pull request #12430 from edx/clrux/ac-408 
AC-408 converting video slider controls from a to div
 2016-05-19 17:27:07 -04:00
sanfordstudent
d95a4c8559 Merge pull request #12493 from edx/sstudent/TNL-4468 
Sstudent/tnl 4468
 2016-05-19 16:07:01 -04:00
clrux
d98bc768df Merge pull request #12299 from edx/clrux/ac-413 
AC-413 adding labels to form fields on Instructor dashboard membership page
 2016-05-19 15:58:04 -04:00
Sanford Student
987fe723a4 adding link clicked event and associated tests 2016-05-19 14:58:22 -04: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
927b74e745 Make separate test processes use separate GRADES_DOWNLOAD and FINANCIAL_REPORTS directories 2016-05-19 12:45:28 -04:00
Calen Pennington
76e0482fb8 Fix a flaky test caused by caching of UserPartition schemes 2016-05-19 11:58:52 -04:00
Dmitry Viskov
21bbcc9f35 Connected aside information is included in the emitted event (on check) 2016-05-19 17:37:40 +03:00
Chris Rodriguez
e0da408f95 AC-408 converting video slider controls from a to div 2016-05-19 10:02:13 -04:00
Christina Roberts
95ffe7cdf3 Merge pull request #12513 from edx/christina/mark-flaky-tests 
Christina/mark flaky tests
 2016-05-18 17:19:03 -04:00
Brian Jacobel
3faaead6b1 Merge pull request #12503 from edx/bjacobel/FEDX-194-more-math-input-issues 
Fix another kind of math problem which was overflowing
 2016-05-18 17:18:11 -04:00
Douglas Hall
6eb2e18469 Merge pull request #12483 from edx/douglashall/SOL-1776/add_studio_acceptance_tests 
SOL-1776 Added Studio settings image upload acceptance tests
 2016-05-18 15:28:55 -04:00
Calen Pennington
8b3ef8725c In order to minimize contention for the mongodb global lock, use one database per process in tests 2016-05-18 14:39:00 -04:00
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
a80773f8dc Mark test as flaky. 
SOL-1811
 2016-05-18 14:24:20 -04:00
cahrens
2c7cdbffc1 Mark test as flaky. 
TNL-4590
 2016-05-18 14:17:53 -04:00
Calen Pennington
e731a118a6 Make external_auth.test_openid_provider tests run independently 2016-05-18 14:10:28 -04:00
Douglas Hall
e2c65c57f1 Added Studio settings image upload acceptance tests 2016-05-18 13:33:25 -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
Brian Jacobel
75ad3f0745 Fix another kind of math problem which was overflowing 2016-05-17 15:14:13 -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
Calen Pennington
3402c657e9 Use separate ContentStore databases for every test 2016-05-16 13:29:15 -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
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