Commit Graph

13837 Commits

Author SHA1 Message Date
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
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
Awais Jibran
3f21b0718f Show error message on password reset if provided passwords does not match. 2016-09-22 10:36:53 +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
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
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
Brian Jacobel
2e0b6c1282 Merge pull request #13418 from edx/bjacobel/new-post-bug
Fix bug where new posts were not assigned a topic ID and would fail to post
2016-09-09 09:32:23 -04:00
Eric Fischer
31953c5e0c Update correct persistent score
* First take at forcing a subsection's grade to update when a signal is
  sent that a problem's score has changed
* Refactor signal handler connection.
* Expand bokchoy tests to cover progress page
* Add some grading unit tests

TNL-5394
TNL-5364
2016-09-08 15:09:05 -04:00
Brian Jacobel
545ef583e7 Fix bug where new posts were not assigned a topic ID and would fail to post
TNL-5442
2016-09-08 12:52:04 -04:00
Jesse Shapiro
ce2ab5b15c Adding 'visible' field for SSO providers 2016-09-08 11:27:09 -04:00
Renzo Lucioni
948c1bd8ae Merge pull request #13408 from edx/renzo/display-catalog-micromasters
Retrieve marketable MicroMasters from the catalog service
2016-09-08 09:47:20 -04:00
Mushtaq Ali
3c16225496 Merge pull request #13411 from edx/mushtaq/a11y-discussions-duplicate-id
Remove duplicate-id rule for a11y discussions
2016-09-08 18:33:13 +05:00
Renzo Lucioni
37523939f2 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-07 17:44:54 -04:00
Brian Jacobel
de15511f0f Merge pull request #13355 from edx/bjacobel/discussion-alerts
Pattern library alerts on discussion pages
2016-09-07 15:05:42 -04:00
Brian Jacobel
49f99146ec Merge pull request #13417 from edx/bjacobel/flaky-5453
Mark DiscussionResponseEditTest.test_vote_report_endorse_after_edit as flaky
2016-09-07 14:04:46 -04:00
Brian Jacobel
86f7e3ba51 Implement Pattern Library alerts in Discussions
TNL-5164
2016-09-07 12:29:19 -04:00
Brian Jacobel
6d8c075969 Merge pull request #13370 from edx/bjacobel/discussion-title-placeholder
Remove placeholders in discussion new post form
2016-09-07 12:24:56 -04:00
Matt Drayer
e53721433f Merge pull request #13413 from edx/release
Merge release back to master
2016-09-07 11:30:24 -04:00
Brian Jacobel
d148868b57 Mark DiscussionResponseEditTest.test_vote_report_endorse_after_edit as flaky 2016-09-07 11:24:47 -04:00
M. Rehan
985449758a Merge pull request #13313 from edx/mrehan/tnl-4945-inherit-lib-problem-setting
TNL-4945 – Prioritize Library defaults over the fields coming from parent blocks.
2016-09-07 14:57:13 +05:00