Commits · 7242fe138b03fed991e2e1f5b9cd4054c608f080 · edx / edx-platform · GitLab

23 Sep, 2016 11 commits
- Declare additional requirements for installing the capa module · 7242fe13
  Jesse Zoldak committed Sep 23, 2016
  
  7242fe13 Browse Files
- Merge pull request #13556 from edx/revert-13555-haikuginger/update-dnd-2.0.10 · 07af5211
```
Revert "[SOL-2077] Update DnDv2 version to 2.0.10"
```
  Ben Patterson committed Sep 23, 2016
  07af5211 Browse Files
- Revert "[SOL-2077] Update DnDv2 version to 2.0.10" · 9fac9fb1
  Ben Patterson committed Sep 23, 2016
  
  9fac9fb1 Browse Files
- Merge pull request #13555 from open-craft/haikuginger/update-dnd-2.0.10 · 8c3d1220
```
[SOL-2077] Update DnDv2 version to 2.0.10
```
  Jesse Shapiro committed Sep 23, 2016
  8c3d1220 Browse Files
- Merge pull request #13452 from shailysangwan/master · 11892dcb
```
replaced static with dynamically generated copyright year
```
  Alison Hodges committed Sep 23, 2016
  11892dcb Browse Files
- Update DnDv2 version to 2.0.10 · b3feb7f3
  Jesse Shapiro committed Sep 23, 2016
  
  b3feb7f3 Browse Files
- replaced static with dynamically generated copyright year · fc639afa
  Shaily Sangwan committed Sep 23, 2016
  
  fc639afa Browse Files
- Merge pull request #13392 from edx/atiya/add-retries-in-registration · c3580e20
```
ECOM-5281 Add retires for email sending while registering.
```
  Attiya Ishaque committed Sep 23, 2016
  c3580e20 Browse Files
- Adding celery task for sending activation email. · fe136122
  attiyaishaque committed Sep 23, 2016
  
  fe136122 Browse Files
- ECOM-5281 Add retires for email sending while registering. · 4bbeaf32
  attiyaishaque committed Sep 23, 2016
  
  4bbeaf32 Browse Files
- Merge pull request #13480 from edx/aj/fix-password-rest-confirm · 45e243da
```
Show error on password reset form
```
  Awais Jibran committed Sep 23, 2016
  45e243da Browse Files
22 Sep, 2016 15 commits
- Merge pull request #13449 from edx/alisan/discussion-sidebar-topics-menu-TNL-5169 · fb35ffb0
```
Add aria attributes to discussion topics sidebar
```
  alisan617 committed Sep 22, 2016
  fb35ffb0 Browse Files
- Merge pull request #13546 from edx/ned/update-translations · 35878825
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Sep 22, 2016
  35878825 Browse Files
- Merge pull request #13543 from edx/douglashall/AC-578/fix_typo · a9939fa1
```
AC-578 Fix marketing link key typo
```
  Douglas Hall committed Sep 22, 2016
  a9939fa1 Browse Files
- Make the left sidebar in Discussion page accessible · 0ffeb463
```
TNL-5169
```
  alisan617 committed Sep 22, 2016
  0ffeb463 Browse Files
- Fix marketing link key typo · 9f29a889
  Douglas Hall committed Sep 22, 2016
  
  9f29a889 Browse Files
- Merge pull request #13522 from edx/efischer/standardize_grades_logging · 1b1bb948
```
Standardize logged errors
```
  Eric Fischer committed Sep 22, 2016
  1b1bb948 Browse Files
- Update translations (autogenerated message) · 0a2e7363
  Ned Batchelder committed Sep 22, 2016
  
  0a2e7363 Browse Files
- Merge pull request #13533 from edx/beryl/integration-tests · 42025461
```
Grades python integration tests
```
  Nimisha Asthagiri committed Sep 22, 2016
  42025461 Browse Files
- Merge pull request #13527 from edx/release · 81083570
```
Release
```
  Andy Armstrong committed Sep 22, 2016
  81083570 Browse Files
- Test: Rescoring problem updates grades accordingly · 613652b7
```
TNL-5465
TNL-802
```
  Nimisha Asthagiri committed Sep 22, 2016
  613652b7 Browse Files
- Test: Changing assignment weight changes course grade · e1f5e40f
```
TNL-5465
```
  Nimisha Asthagiri committed Sep 22, 2016
  e1f5e40f Browse Files
- Standardize logged errors · 9b9ab2e4
```
For easier consumption by splunk, match the pattern used by other grades-
related log statements. Also, reduce the firehose of events being logged
in splunk.
```
  Eric Fischer committed Sep 22, 2016
  9b9ab2e4 Browse Files
- Merge pull request #13492 from edx/asadiqbal08/WL-603-edx · 0b7ec75a
```
WL-603 load locale paths for themes directories
```
  Asad Iqbal committed Sep 22, 2016
  0b7ec75a Browse Files
- WL-603 load locale paths for themes directories · 2833d1e9
  asadiqbal committed Sep 22, 2016
  
  2833d1e9 Browse Files
- Show error message on password reset if provided passwords does not match. · 3f21b071
  Awais Jibran committed Sep 22, 2016
  
  3f21b071 Browse Files
21 Sep, 2016 8 commits
- Merge pull request #13530 from edx/hotfix/2016-09-21 · 13608048
```
Revert "[SOL-1953] Update Commerce Configuration"
```
  Andy Armstrong committed Sep 21, 2016
  13608048 Browse Files
- Merge pull request #13152 from edx/add-openedx-yaml · d145457b
```
Add an OEP-2 compliant openedx.yaml file
```
  Calen Pennington committed Sep 21, 2016
  d145457b Browse Files
- Revert "[SOL-1953] Update Commerce Configuration" · c52ba6ac
  Michael Frey committed Sep 21, 2016
  
  c52ba6ac Browse Files
- Merge pull request #13495 from edx/beryl/test-explicit-graded · 5b7f48c5
```
tests for changing grade policy
and moving progress page tests into separate file
```
  sanfordstudent committed Sep 21, 2016
  5b7f48c5 Browse Files
- Merge pull request #13334 from edx/clrux/ac-571-video-transcript-download · 4f28b81f
```
AC-571 updating video download/transcript area
```
  Chris committed Sep 21, 2016
  4f28b81f Browse Files
- TNL-5466 tests for changing grade policy · a98e33af
```
and moving progress page tests into separate file
```
  Sanford Student committed Sep 21, 2016
  a98e33af Browse Files
- Merge pull request #13524 from Stanford-Online/giulio/revert-ajax-fa-spinner · 13d7ea46
```
Revert "Add fa loading spinner to CAPA problems"
```
  Albert (AJ) St. Aubin committed Sep 21, 2016
  13d7ea46 Browse Files
- Merge pull request #13501 from edx/rc/2016-09-20 · 777964b9
```
Release Candidate rc/2016-09-20
```
  Andy Armstrong committed Sep 20, 2016
  777964b9 Browse Files
20 Sep, 2016 6 commits
- Merge pull request #13523 from stvstnfrd/up/clean/delete-course · 2e911744
```
Remove outdated comment
```
  Ned Batchelder committed Sep 20, 2016
  2e911744 Browse Files
- Revert "Add fa loading spinner to CAPA problems" · 0eca0ead
```
This reverts commit a3eb726f.
```
  Giulio Gratta committed Sep 20, 2016
  0eca0ead Browse Files
- Remove outdated comment · 8a27ba05
```
The `commit` argument had already been removed from code [1][2][3],
prompted by the django18 upgrade.

[1] https://github.com/edx/edx-platform/pull/10927
[2] 07f015bb
[3] a4006c86
```
  stv committed Sep 20, 2016
  8a27ba05 Browse Files
- Merge pull request #13519 from edx/bjacobel/TNL-5586 · 1b39ca12
```
Fix alignment of "mark as answer button" by adding btn-link class
```
  Andy Armstrong committed Sep 20, 2016
  1b39ca12 Browse Files
- Fix alignment of "mark as answer button" by adding btn-link class · 1c90b318
```
TNL-5586
```
  Brian Jacobel committed Sep 20, 2016
  1c90b318 Browse Files
- Merge pull request #13508 from edx/douglashal/HULL-103/provide_course_root_to_email_template · 2a0bdeb3
```
HULL-103 Add the course root to the bulk email template context so that templa…
```
  Douglas Hall committed Sep 20, 2016
  2a0bdeb3 Browse Files