Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

19803 Commits

Author SHA1 Message Date
Douglas Hall
1d1952c8d3 Added SiteMixin for tests that need to test Site specific functionality 2016-09-23 15:57:08 -04:00
Brandon DeRosier
cdf413bda2 Disambiguate queryset extensions for ConfigurationModels 
This change disambiguates the use of `id` in the
ConfigurationModelManager queryset extensions. This is required
when specifying KEY_FIELDS where there is more than one key and
at least one of them is a ForeignKey. The table must be specified
in this case because the query extension may be appended to the
WHERE clause of queries selecting `id` fields from multiple tables
via an INNER JOIN clause.
 2016-09-23 13:47:06 -04:00
Jesse Zoldak
24ae284f34 Move helper methods from the capa tests module __init__ file 2016-09-23 13:21:49 -04:00
Jesse Zoldak
7242fe138b Declare additional requirements for installing the capa module 2016-09-23 13:07:00 -04:00
Matjaz Gregoric
344c72b3e2 Use non-ascii PLATFORM_NAME in tests. 
It should help catch unicode encoding problems earlier.

This also updates python-saml dependency to a version that includes a
patch for unicode strings.
 2016-09-23 15:38:23 +02:00
Matjaz Gregoric
977e664afe Don't fail if platform name contains non-ascii characters. 2016-09-23 15:38:23 +02:00
attiyaishaque
fe136122db Adding celery task for sending activation email. 2016-09-23 11:43:26 +05:00
attiyaishaque
4bbeaf32ae ECOM-5281 Add retires for email sending while registering. 2016-09-23 11:43:26 +05:00
Awais Jibran
45e243da5c Merge pull request #13480 from edx/aj/fix-password-rest-confirm 
Show error on password reset form
 2016-09-23 09:56:25 +05:00
alisan617
fb35ffb07d Merge pull request #13449 from edx/alisan/discussion-sidebar-topics-menu-TNL-5169 
Add aria attributes to discussion topics sidebar
 2016-09-22 17:48:57 -04:00
Douglas Hall
8f6182aabf Allow for site override of MKTG_URLS setting in index view 2016-09-22 15:58:27 -04:00
alisan617
0ffeb4639b Make the left sidebar in Discussion page accessible 
TNL-5169
 2016-09-22 15:28:29 -04:00
Andy Armstrong
810835700a Merge pull request #13527 from edx/release 
Release
 2016-09-22 13:05:33 -04:00
Muddasser
8774728226 Base url for help links is changed 2016-09-22 09:58:34 +00:00
Muddasser
9aee093300 Addressed Comments 2016-09-22 07:15:54 +00:00
Muddasser
3683ee7f32 Help Links second pass 2016-09-22 07:15:54 +00:00
Muddasser
c64d9aaabe automate help links 2016-09-22 07:15:54 +00:00
Awais Jibran
3f21b0718f Show error message on password reset if provided passwords does not match. 2016-09-22 10:36:53 +05:00
Felipe Volpone
14f1fdf3c9 Disabling the "View Unit in Studio" button to CCX courses 2016-09-22 00:45:18 -03:00
Daniel Naranjo
6eda03159f Remove invalid selector 
removing a selector that is not used by sass and not part of CSS.
 2016-09-21 12:08:41 -05:00
sanfordstudent
5b7f48c5ed Merge pull request #13495 from edx/beryl/test-explicit-graded 
tests for changing grade policy
and moving progress page tests into separate file
 2016-09-21 12:28:33 -04:00
Chris
4f28b81fee Merge pull request #13334 from edx/clrux/ac-571-video-transcript-download 
AC-571 updating video download/transcript area
 2016-09-21 10:32:20 -04:00
Sanford Student
a98e33afd8 TNL-5466 tests for changing grade policy 
and moving progress page tests into separate file
 2016-09-21 09:48:46 -04:00
Giulio Gratta
0eca0eadaf Revert "Add fa loading spinner to CAPA problems" 
This reverts commit a3eb726f5f.
 2016-09-20 12:56:20 -07:00
Brian Jacobel
1c90b3186a Fix alignment of "mark as answer button" by adding btn-link class 
TNL-5586
 2016-09-20 11:30:49 -04:00
Chris Rodriguez
0ebc90472c AC-571 updating video download/transcript area 2016-09-20 06:22:24 -04:00
Muzaffar yousaf
087acb8ae0 Merge pull request #13434 from edx/mushtaq/a11y-discussions-icon-aria-hidden 
Remove icon-aria-hidden rule for a11y discussions
 2016-09-19 19:34:27 +05:00
Brian Jacobel
a2bf4696e4 Merge pull request #13428 from edx/bjacobel/topic-list-dropdown 
Replace discussion topic selector with a native dropdown
 2016-09-19 09:53:17 -04:00
Mushtaq Ali
a1945c18d1 Remove icon-aria-hidden rule for a11y discussions 
TNL-4637 TNL-4641 TNL-4645
 2016-09-19 12:30:20 +05:00
Muddasser
dd876d8be1 Merge pull request #13312 from edx/muddasser/TNL-5315 
lms/navigation.feature to bokchoy
 2016-09-19 11:17:39 +05:00
Matjaz Gregoric
c47561e1bb Don't show error in studio when fetching YouTube metadata fails. 
The error message was very confusing ("Studio is having trouble saving
your work").

Log a warning in the JS console instead.
 2016-09-18 16:42:50 +02:00
Brian Jacobel
c28fc04b78 Commenting out color-contrast tests for DiscussionOpenClosedThreadTest because of Jenkins issues 2016-09-16 13:11:21 -04:00
Brian Jacobel
a229e1f028 Fix DiscussionHomePageTest color-contrast issues - TNL-4635 2016-09-16 13:11:21 -04:00
Brian Jacobel
a19274c84f Fix DiscussionOpenClosedThreadTest color-contrast issues - TNL-4644 2016-09-16 13:11:20 -04:00
Brian Jacobel
ad1aa2b35f Fix DiscussionTabMultipleThreadTest color-contrast issues - TNL-4639 2016-09-16 13:11:20 -04:00
Sanford Student
bf1fcc68cd bok choy tests for persistent grades 2016-09-15 13:23:20 -04:00
Albert (AJ) St. Aubin
1586b88d8c Merge pull request #13224 from Stanford-Online/giulio/capa-loading-spinner-upstream 
Add font awesome loading spinner to CAPA problems
 2016-09-15 09:17:56 -04:00
Chris
23cc23bb9c Merge pull request #13386 from edx/clrux/ac-578-logistration-label-link 
AC-578 fixing link in label on logistration form
 2016-09-15 07:30:11 -04:00
Oksana Slusarenro
cda7f1dc6c Changed the Help and Field Label text. 2016-09-15 10:24:54 +03:00
Giulio Gratta
a3eb726f5f Add font awesome loading spinner to CAPA problems 
- loading spinner is automatically replaced by the content when AJAX problem_get returns
 2016-09-14 14:58:35 -07:00
Christina Roberts
2afc986666 Merge pull request #13469 from edx/release 
Merge release back into master
 2016-09-14 17:11:53 -04:00
Chris Rodriguez
2e3129fbd8 AC-578 fixing link in label on logistration form 2016-09-14 14:59:14 -04:00
Brian Jacobel
2a984c60b5 Replace discussion topic selector with a native dropdown 
TNL-5165
 2016-09-14 14:19:11 -04:00
cahrens
c7c8a4e500 Don't delete question p-tag if children. 
TNL-5510
 2016-09-14 09:45:24 -04:00
John Eskew
c205f9650c Merge pull request #13419 from edx/jeskew/opaque_keys_test 
Update opaque-keys and ccx-keys versions.
 2016-09-13 17:01:44 -04:00
John Eskew
9e07bb530c Bump edx-opaque-keys version to 0.3.4 2016-09-13 14:54:32 -04:00
Nimisha Asthagiri
cca19c321e Merge pull request #13442 from edx/tnl/enrollment_queries_cache 
Cache Enrollment state for (user, course) in request cache
 2016-09-12 16:46:36 -04:00
Nimisha Asthagiri
5822919549 Cache Enrollment state for (user, course) in request cache. 2016-09-12 15:56:03 -04:00
Renzo Lucioni
066e7e8c36 Retrieve marketable MicroMasters from the catalog service 
Catalog-based MicroMasters need to be displayed in the LMS. However, the LMS currently retrieves all program data from the soon-to-be-retired programs service. Consuming program data exclusively from the catalog service is out of the question right now; it's too complex to confidently pull off in a week. This is a functional middle ground introduced by ECOM-5460. Cleaning up this debt is tracked by ECOM-4418.
 2016-09-12 11:01:30 -04:00
Matjaz Gregoric
8dc84bec3a Enable discussions on CCX courses. 
Discussion is restricted to the CCX course (there is no sharing of
discussions with the parent course or other CCX instances).
 2016-09-12 09:51:05 +02:00